@dimah-s3/db 2.0.0-beta.0 → 2.0.0-beta.1
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/README.md +3 -3
- package/dist/adapters/drizzle.d.ts +2 -1
- package/dist/adapters/drizzle.d.ts.map +1 -1
- package/dist/cli.d.ts +8 -9
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +31 -88
- package/dist/cli.js.map +1 -1
- package/dist/drizzle/mysql.d.ts +2 -1
- package/dist/drizzle/mysql.d.ts.map +1 -1
- package/dist/drizzle/mysql.js +5 -11
- package/dist/drizzle/mysql.js.map +1 -1
- package/dist/drizzle/pg.d.ts +2 -1
- package/dist/drizzle/pg.d.ts.map +1 -1
- package/dist/drizzle/pg.js +5 -11
- package/dist/drizzle/pg.js.map +1 -1
- package/dist/drizzle/shared.d.ts +3 -12
- package/dist/drizzle/shared.d.ts.map +1 -1
- package/dist/drizzle/sqlite.d.ts +2 -1
- package/dist/drizzle/sqlite.d.ts.map +1 -1
- package/dist/drizzle/sqlite.js +5 -11
- package/dist/drizzle/sqlite.js.map +1 -1
- package/dist/fuma-db.d.ts +5 -26
- package/dist/fuma-db.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +25 -61
- package/dist/index.js.map +1 -1
- package/dist/schema/{v2.d.ts → schema.d.ts} +16 -7
- package/dist/schema/schema.d.ts.map +1 -0
- package/dist/store/create-db-store.d.ts +2 -2
- package/dist/store/map-row.d.ts +1 -1
- package/dist/store/object-store.d.ts +4 -4
- package/dist/store/object-store.d.ts.map +1 -1
- package/dist/store/schema-version.d.ts +1 -1
- package/package.json +9 -6
- package/src/drizzle/mysql.ts +172 -0
- package/src/drizzle/pg.ts +140 -0
- package/src/drizzle/sqlite.ts +144 -0
- package/dist/schema/v1.d.ts +0 -24
- package/dist/schema/v1.d.ts.map +0 -1
- package/dist/schema/v2.d.ts.map +0 -1
- package/sql/upgrade/1.0.0-2.0.0/mysql.sql +0 -71
- package/sql/upgrade/1.0.0-2.0.0/pg.sql +0 -47
- package/sql/upgrade/1.0.0-2.0.0/sqlite.sql +0 -119
package/dist/drizzle/sqlite.js
CHANGED
|
@@ -1,23 +1,17 @@
|
|
|
1
|
+
import { createId } from '@paralleldrive/cuid2';
|
|
1
2
|
import { sql } from 'drizzle-orm';
|
|
2
3
|
import { sqliteTable, text, uniqueIndex, index, integer } from 'drizzle-orm/sqlite-core';
|
|
3
|
-
import { createId } from '@paralleldrive/cuid2';
|
|
4
|
-
|
|
5
|
-
// src/drizzle/sqlite.ts
|
|
6
|
-
var DIMAH_S3_SCHEMA_VERSION = "2.0.0";
|
|
7
|
-
var runtimeDefaults = {
|
|
8
|
-
id: () => createId(),
|
|
9
|
-
now: () => /* @__PURE__ */ new Date()
|
|
10
|
-
};
|
|
11
4
|
|
|
12
5
|
// src/drizzle/sqlite.ts
|
|
6
|
+
var SCHEMA_VERSION = "2.0.0";
|
|
13
7
|
function id() {
|
|
14
|
-
return text("id").primaryKey().$defaultFn(
|
|
8
|
+
return text("id").primaryKey().$defaultFn(() => createId());
|
|
15
9
|
}
|
|
16
10
|
function timestamp(name) {
|
|
17
11
|
return integer(name, { mode: "timestamp_ms" });
|
|
18
12
|
}
|
|
19
13
|
function timestampNow(name) {
|
|
20
|
-
return timestamp(name).notNull().default(sql`(strftime('%s', 'now') * 1000)`).$defaultFn(
|
|
14
|
+
return timestamp(name).notNull().default(sql`(strftime('%s', 'now') * 1000)`).$defaultFn(() => /* @__PURE__ */ new Date());
|
|
21
15
|
}
|
|
22
16
|
function byteCount(name) {
|
|
23
17
|
return integer(name, { mode: "number" });
|
|
@@ -94,7 +88,7 @@ var storageFolder = sqliteTable(
|
|
|
94
88
|
);
|
|
95
89
|
var dimahS3Settings = sqliteTable("private_dimah_s3_settings", {
|
|
96
90
|
key: text("key").primaryKey(),
|
|
97
|
-
version: text("value").notNull().default(
|
|
91
|
+
version: text("value").notNull().default(SCHEMA_VERSION)
|
|
98
92
|
});
|
|
99
93
|
var dimahS3Tables = {
|
|
100
94
|
storageObject,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/drizzle/
|
|
1
|
+
{"version":3,"sources":["../../src/drizzle/sqlite.ts"],"names":[],"mappings":";;;;;AA0BA,IAAM,cAAA,GAAiB,OAAA;AAEvB,SAAS,EAAA,GAAK;AACZ,EAAA,OAAO,IAAA,CAAK,IAAI,CAAA,CACb,UAAA,GACA,UAAA,CAAW,MAAM,UAAU,CAAA;AAChC;AAEA,SAAS,UAAU,IAAA,EAAc;AAC/B,EAAA,OAAO,OAAA,CAAQ,IAAA,EAAM,EAAE,IAAA,EAAM,gBAAgB,CAAA;AAC/C;AAEA,SAAS,aAAa,IAAA,EAAc;AAClC,EAAA,OAAO,SAAA,CAAU,IAAI,CAAA,CAClB,OAAA,EAAQ,CACR,OAAA,CAAQ,GAAA,CAAA,8BAAA,CAAmC,CAAA,CAC3C,UAAA,CAAW,sBAAM,IAAI,IAAA,EAAM,CAAA;AAChC;AAEA,SAAS,UAAU,IAAA,EAAc;AAC/B,EAAA,OAAO,OAAA,CAAQ,IAAA,EAAM,EAAE,IAAA,EAAM,UAAU,CAAA;AACzC;AAGO,IAAM,aAAA,GAAgB,WAAA;AAAA,EAC3B,gBAAA;AAAA,EACA;AAAA,IACE,IAAI,EAAA,EAAG;AAAA,IACP,KAAA,EAAO,IAAA,CAAK,OAAO,CAAA,CAAE,OAAA,EAAQ;AAAA,IAC7B,MAAA,EAAQ,IAAA,CAAK,QAAQ,CAAA,CAAE,OAAA,EAAQ;AAAA,IAC/B,GAAA,EAAK,IAAA,CAAK,KAAK,CAAA,CAAE,OAAA,EAAQ;AAAA,IACzB,KAAA,EAAO,IAAA,CAAK,OAAO,CAAA,CAAE,OAAA,EAAQ;AAAA,IAC7B,MAAA,EAAQ,KAAK,QAAQ,CAAA;AAAA,IACrB,QAAA,EAAU,IAAA,CAAK,UAAU,CAAA,CAAE,OAAA,EAAQ;AAAA,IACnC,WAAA,EAAa,KAAK,cAAc,CAAA;AAAA,IAChC,IAAA,EAAM,UAAU,MAAM,CAAA;AAAA,IACtB,YAAA,EAAc,UAAU,eAAe,CAAA;AAAA,IACvC,IAAA,EAAM,KAAK,OAAO,CAAA;AAAA,IAClB,QAAQ,IAAA,CAAK,QAAQ,CAAA,CAAE,KAAA,GAA6B,OAAA,EAAQ;AAAA,IAC5D,UAAA,EAAY,KAAK,aAAA,EAAe,EAAE,MAAM,MAAA,EAAQ,EAAE,KAAA,EAEhD;AAAA,IACF,YAAY,IAAA,CAAK,YAAA,EAAc,EAAE,IAAA,EAAM,QAAQ,CAAA;AAAA,IAC/C,GAAA,EAAK,KAAK,KAAK,CAAA;AAAA,IACf,QAAA,EAAU,KAAK,WAAW,CAAA;AAAA,IAC1B,WAAA,EAAa,KAAK,cAAc,CAAA;AAAA,IAChC,SAAA,EAAW,UAAU,YAAY,CAAA;AAAA,IACjC,WAAA,EAAa,UAAU,cAAc,CAAA;AAAA,IACrC,SAAA,EAAW,aAAa,YAAY,CAAA;AAAA,IACpC,SAAA,EAAW,aAAa,YAAY,CAAA;AAAA,IACpC,SAAA,EAAW,UAAU,YAAY;AAAA,GACnC;AAAA,EACA,CAAC,KAAA,KAAU;AAAA,IACT,YAAY,8BAA8B,CAAA,CAAE,GAAG,KAAA,CAAM,MAAA,EAAQ,MAAM,GAAG,CAAA;AAAA,IACtE,KAAA,CAAM,iCAAiC,CAAA,CAAE,EAAA;AAAA,MACvC,KAAA,CAAM,KAAA;AAAA,MACN,KAAA,CAAM,MAAA;AAAA,MACN,KAAA,CAAM,MAAA;AAAA,MACN,KAAA,CAAM;AAAA,KACR;AAAA,IACA,KAAA,CAAM,kCAAkC,CAAA,CAAE,EAAA;AAAA,MACxC,KAAA,CAAM,KAAA;AAAA,MACN,KAAA,CAAM,MAAA;AAAA,MACN,KAAA,CAAM;AAAA,KACR;AAAA,IACA,KAAA,CAAM,mCAAmC,CAAA,CAAE,EAAA;AAAA,MACzC,KAAA,CAAM,KAAA;AAAA,MACN,KAAA,CAAM,MAAA;AAAA,MACN,KAAA,CAAM;AAAA,KACR;AAAA,IACA,KAAA,CAAM,+BAA+B,CAAA,CAAE,EAAA;AAAA,MACrC,KAAA,CAAM,KAAA;AAAA,MACN,KAAA,CAAM,MAAA;AAAA,MACN,KAAA,CAAM;AAAA,KACR;AAAA,IACA,KAAA,CAAM,mCAAmC,CAAA,CAAE,EAAA;AAAA,MACzC,KAAA,CAAM,MAAA;AAAA,MACN,KAAA,CAAM;AAAA;AACR;AAEJ;AAGO,IAAM,aAAA,GAAgB,WAAA;AAAA,EAC3B,gBAAA;AAAA,EACA;AAAA,IACE,IAAI,EAAA,EAAG;AAAA,IACP,KAAA,EAAO,IAAA,CAAK,OAAO,CAAA,CAAE,OAAA,EAAQ;AAAA,IAC7B,IAAA,EAAM,IAAA,CAAK,MAAM,CAAA,CAAE,OAAA,EAAQ;AAAA,IAC3B,MAAA,EAAQ,KAAK,QAAQ,CAAA;AAAA,IACrB,IAAA,EAAM,IAAA,CAAK,MAAM,CAAA,CAAE,OAAA,EAAQ;AAAA,IAC3B,SAAA,EAAW,aAAa,YAAY;AAAA,GACtC;AAAA,EACA,CAAC,KAAA,KAAU;AAAA,IACT,YAAY,8BAA8B,CAAA,CAAE,GAAG,KAAA,CAAM,KAAA,EAAO,MAAM,IAAI,CAAA;AAAA,IACtE,MAAM,iCAAiC,CAAA,CAAE,GAAG,KAAA,CAAM,KAAA,EAAO,MAAM,MAAM;AAAA;AAEzE;AAMO,IAAM,eAAA,GAAkB,YAAY,2BAAA,EAA6B;AAAA,EACtE,GAAA,EAAK,IAAA,CAAK,KAAK,CAAA,CAAE,UAAA,EAAW;AAAA,EAC5B,SAAS,IAAA,CAAK,OAAO,EAAE,OAAA,EAAQ,CAAE,QAAQ,cAAc;AACzD,CAAC;AAOM,IAAM,aAAA,GAAgB;AAAA,EAC3B,aAAA;AAAA,EACA,aAAA;AAAA,EACA,yBAAA,EAA2B;AAC7B","file":"sqlite.js","sourcesContent":["/**\n * Drizzle schema for @dimah-s3/db on SQLite. Copy this file into your app\n * (`db/schema.ts`) to own the tables and add columns. Keep the table names,\n * the column names, and the `dimahS3Tables` keys: the adapter finds the\n * tables by those keys. A column you add must be nullable or have a default.\n * The plugin does not read or write it.\n *\n * Import `dimahS3Tables` from `@dimah-s3/db/drizzle/sqlite` when the tables\n * stay as they are. `drizzle-kit` then follows that import, and a later push\n * drops a column that is not part of it.\n *\n * Timestamps are epoch milliseconds and sizes are integers, matching\n * `sql/sqlite.sql`. Requires `drizzle-orm` and `@paralleldrive/cuid2`.\n */\nimport { createId } from \"@paralleldrive/cuid2\";\nimport { sql } from \"drizzle-orm\";\nimport {\n index,\n integer,\n sqliteTable,\n text,\n uniqueIndex,\n} from \"drizzle-orm/sqlite-core\";\n\ntype StorageObjectStatus = \"pending\" | \"active\" | \"deleted\" | \"purging\";\n\nconst SCHEMA_VERSION = \"2.0.0\";\n\nfunction id() {\n return text(\"id\")\n .primaryKey()\n .$defaultFn(() => createId());\n}\n\nfunction timestamp(name: string) {\n return integer(name, { mode: \"timestamp_ms\" });\n}\n\nfunction timestampNow(name: string) {\n return timestamp(name)\n .notNull()\n .default(sql`(strftime('%s', 'now') * 1000)`)\n .$defaultFn(() => new Date());\n}\n\nfunction byteCount(name: string) {\n return integer(name, { mode: \"number\" });\n}\n\n/** The `storage_object` table: one row per tracked object. */\nexport const storageObject = sqliteTable(\n \"storage_object\",\n {\n id: id(),\n scope: text(\"scope\").notNull(),\n bucket: text(\"bucket\").notNull(),\n key: text(\"key\").notNull(),\n route: text(\"route\").notNull(),\n folder: text(\"folder\"),\n filename: text(\"filename\").notNull(),\n contentType: text(\"content_type\"),\n size: byteCount(\"size\"),\n declaredSize: byteCount(\"declared_size\"),\n eTag: text(\"e_tag\"),\n status: text(\"status\").$type<StorageObjectStatus>().notNull(),\n s3Metadata: text(\"s3_metadata\", { mode: \"json\" }).$type<\n Record<string, string>\n >(),\n attributes: text(\"attributes\", { mode: \"json\" }),\n acl: text(\"acl\"),\n uploadId: text(\"upload_id\"),\n uploadToken: text(\"upload_token\"),\n expiresAt: timestamp(\"expires_at\"),\n confirmedAt: timestamp(\"confirmed_at\"),\n createdAt: timestampNow(\"created_at\"),\n updatedAt: timestampNow(\"updated_at\"),\n deletedAt: timestamp(\"deleted_at\"),\n },\n (table) => [\n uniqueIndex(\"storage_object_bucket_key_uk\").on(table.bucket, table.key),\n index(\"storage_object_scope_folder_idx\").on(\n table.scope,\n table.status,\n table.folder,\n table.createdAt,\n ),\n index(\"storage_object_scope_updated_idx\").on(\n table.scope,\n table.status,\n table.updatedAt,\n ),\n index(\"storage_object_scope_filename_idx\").on(\n table.scope,\n table.status,\n table.filename,\n ),\n index(\"storage_object_scope_size_idx\").on(\n table.scope,\n table.status,\n table.size,\n ),\n index(\"storage_object_status_expires_idx\").on(\n table.status,\n table.expiresAt,\n ),\n ],\n);\n\n/** The `storage_folder` table: one row per folder, so empty folders list. */\nexport const storageFolder = sqliteTable(\n \"storage_folder\",\n {\n id: id(),\n scope: text(\"scope\").notNull(),\n path: text(\"path\").notNull(),\n parent: text(\"parent\"),\n name: text(\"name\").notNull(),\n createdAt: timestampNow(\"created_at\"),\n },\n (table) => [\n uniqueIndex(\"storage_folder_scope_path_uk\").on(table.scope, table.path),\n index(\"storage_folder_scope_parent_idx\").on(table.scope, table.parent),\n ],\n);\n\n/**\n * The FumaDB settings table. The Drizzle adapter reads the schema version\n * from the default of its `version` column, which is stored as `value`.\n */\nexport const dimahS3Settings = sqliteTable(\"private_dimah_s3_settings\", {\n key: text(\"key\").primaryKey(),\n version: text(\"value\").notNull().default(SCHEMA_VERSION),\n});\n\n/**\n * Every @dimah-s3/db table. Spread it into your Drizzle schema and keep its\n * keys, because the FumaDB Drizzle adapter finds tables by them:\n * `drizzle({ client, relations: defineRelations({ ...dimahS3Tables }) })`.\n */\nexport const dimahS3Tables = {\n storageObject,\n storageFolder,\n private_dimah_s3_settings: dimahS3Settings,\n};\n"]}
|
package/dist/fuma-db.d.ts
CHANGED
|
@@ -1,32 +1,12 @@
|
|
|
1
1
|
import { type InferFumaDB } from "fumadb";
|
|
2
|
-
import { v2 } from "./schema/v2";
|
|
3
2
|
/**
|
|
4
3
|
* The @dimah-s3/db FumaDB library. Call `DimahS3DB.client(adapter)` with an
|
|
5
4
|
* adapter from `@dimah-s3/db/adapters/*` to get a {@link DimahS3DbClient}.
|
|
5
|
+
*
|
|
6
|
+
* `predecessor` is empty. FumaDB skips `up` on the first schema, and the
|
|
7
|
+
* indexes are created in {@link dbSchema}'s `up`.
|
|
6
8
|
*/
|
|
7
|
-
export declare const DimahS3DB: import("fumadb").FumaDBFactory<(import("fumadb/schema").Schema<"1.0.0", {
|
|
8
|
-
storageObject: import("fumadb/schema").Table<{
|
|
9
|
-
id: import("fumadb/schema").IdColumn<"varchar(255)", string | null, string>;
|
|
10
|
-
scope: import("fumadb/schema").Column<"string", string, string>;
|
|
11
|
-
bucket: import("fumadb/schema").Column<"string", string, string>;
|
|
12
|
-
key: import("fumadb/schema").Column<"string", string, string>;
|
|
13
|
-
route: import("fumadb/schema").Column<"string", string, string>;
|
|
14
|
-
contentType: import("fumadb/schema").Column<"string", string | null, string | null>;
|
|
15
|
-
size: import("fumadb/schema").Column<"bigint", bigint | null, bigint | null>;
|
|
16
|
-
eTag: import("fumadb/schema").Column<"string", string | null, string | null>;
|
|
17
|
-
filename: import("fumadb/schema").Column<"string", string | null, string | null>;
|
|
18
|
-
status: import("fumadb/schema").Column<"string", string, string>;
|
|
19
|
-
s3Metadata: import("fumadb/schema").Column<"json", unknown, unknown>;
|
|
20
|
-
acl: import("fumadb/schema").Column<"string", string | null, string | null>;
|
|
21
|
-
uploadId: import("fumadb/schema").Column<"string", string | null, string | null>;
|
|
22
|
-
declaredSize: import("fumadb/schema").Column<"bigint", bigint | null, bigint | null>;
|
|
23
|
-
confirmedAt: import("fumadb/schema").Column<"timestamp", Date | null, Date | null>;
|
|
24
|
-
expiresAt: import("fumadb/schema").Column<"timestamp", Date | null, Date | null>;
|
|
25
|
-
createdAt: import("fumadb/schema").Column<"timestamp", Date | null, Date>;
|
|
26
|
-
updatedAt: import("fumadb/schema").Column<"timestamp", Date | null, Date>;
|
|
27
|
-
deletedAt: import("fumadb/schema").Column<"timestamp", Date | null, Date | null>;
|
|
28
|
-
}, {}>;
|
|
29
|
-
}> | import("fumadb/schema").Schema<"2.0.0", {
|
|
9
|
+
export declare const DimahS3DB: import("fumadb").FumaDBFactory<(import("fumadb/schema").Schema<"0.0.1", {}> | import("fumadb/schema").Schema<"2.0.0", {
|
|
30
10
|
storageObject: import("fumadb/schema").Table<{
|
|
31
11
|
id: import("fumadb/schema").IdColumn<"varchar(255)", string | null, string>;
|
|
32
12
|
scope: import("fumadb/schema").Column<"string", string, string>;
|
|
@@ -60,9 +40,8 @@ export declare const DimahS3DB: import("fumadb").FumaDBFactory<(import("fumadb/s
|
|
|
60
40
|
createdAt: import("fumadb/schema").Column<"timestamp", Date | null, Date>;
|
|
61
41
|
}, {}>;
|
|
62
42
|
}>)[]>;
|
|
63
|
-
/** FumaDB client for the @dimah-s3/db
|
|
43
|
+
/** FumaDB client for the @dimah-s3/db schema. */
|
|
64
44
|
export type DimahS3DbClient = InferFumaDB<typeof DimahS3DB>;
|
|
65
45
|
/** The schema version the stores read and write. */
|
|
66
46
|
export declare const DB_SCHEMA_VERSION: "2.0.0";
|
|
67
|
-
export { v2 };
|
|
68
47
|
//# sourceMappingURL=fuma-db.d.ts.map
|
package/dist/fuma-db.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fuma-db.d.ts","sourceRoot":"","sources":["../src/fuma-db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,WAAW,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"fuma-db.d.ts","sourceRoot":"","sources":["../src/fuma-db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,WAAW,EAAE,MAAM,QAAQ,CAAC;AAGlD;;;;;;GAMG;AACH,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAGpB,CAAC;AAEH,iDAAiD;AACjD,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC,OAAO,SAAS,CAAC,CAAC;AAE5D,oDAAoD;AACpD,eAAO,MAAM,iBAAiB,SAAmB,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { DB_SCHEMA_VERSION, DimahS3DB,
|
|
1
|
+
export { DB_SCHEMA_VERSION, DimahS3DB, type DimahS3DbClient } from "./fuma-db";
|
|
2
2
|
export { db, type DbPluginContext } from "./plugin/db";
|
|
3
3
|
export type { PruneDeletedOptions, PurgeStaleOptions, PurgeStaleResult, } from "./plugin/purge";
|
|
4
4
|
export type { DbFolders, DbObjects } from "./plugin/public-stores";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AAG/E,OAAO,EAAE,EAAE,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AACvD,YAAY,EACV,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnE,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,EACf,aAAa,EACb,cAAc,EACd,YAAY,EACZ,cAAc,GACf,MAAM,gBAAgB,CAAC;AAGxB,YAAY,EACV,aAAa,EACb,aAAa,EACb,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACV,cAAc,EACd,cAAc,EACd,UAAU,EACV,eAAe,EACf,OAAO,EACP,OAAO,GACR,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,YAAY,EACV,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,SAAS,EACT,iBAAiB,GAClB,MAAM,sBAAsB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -7,37 +7,10 @@ import * as z from 'zod';
|
|
|
7
7
|
import { AbortMultipartUploadCommand, HeadObjectCommand } from '@aws-sdk/client-s3';
|
|
8
8
|
|
|
9
9
|
// src/fuma-db.ts
|
|
10
|
-
var storageObject = table("storage_object", {
|
|
11
|
-
id: idColumn("id", "varchar(255)").defaultTo$("auto"),
|
|
12
|
-
scope: column("scope", "string"),
|
|
13
|
-
bucket: column("bucket", "string"),
|
|
14
|
-
key: column("key", "string"),
|
|
15
|
-
route: column("route", "string"),
|
|
16
|
-
contentType: column("content_type", "string").nullable(),
|
|
17
|
-
size: column("size", "bigint").nullable(),
|
|
18
|
-
eTag: column("e_tag", "string").nullable(),
|
|
19
|
-
filename: column("filename", "string").nullable(),
|
|
20
|
-
status: column("status", "string"),
|
|
21
|
-
s3Metadata: column("metadata", "json").nullable(),
|
|
22
|
-
acl: column("acl", "string").nullable(),
|
|
23
|
-
uploadId: column("upload_id", "string").nullable(),
|
|
24
|
-
declaredSize: column("declared_size", "bigint").nullable(),
|
|
25
|
-
confirmedAt: column("confirmed_at", "timestamp").nullable(),
|
|
26
|
-
expiresAt: column("expires_at", "timestamp").nullable(),
|
|
27
|
-
createdAt: column("created_at", "timestamp").defaultTo$("now"),
|
|
28
|
-
updatedAt: column("updated_at", "timestamp").defaultTo$("now"),
|
|
29
|
-
deletedAt: column("deleted_at", "timestamp").nullable()
|
|
30
|
-
}).unique("storage_object_bucket_key_uk", ["bucket", "key"]);
|
|
31
|
-
var v1 = schema({
|
|
32
|
-
version: "1.0.0",
|
|
33
|
-
tables: {
|
|
34
|
-
storageObject
|
|
35
|
-
}
|
|
36
|
-
});
|
|
37
10
|
function byteCount(name) {
|
|
38
11
|
return column(name, "bigint").nullable();
|
|
39
12
|
}
|
|
40
|
-
var
|
|
13
|
+
var storageObject = table("storage_object", {
|
|
41
14
|
id: idColumn("id", "varchar(255)").defaultTo$("auto"),
|
|
42
15
|
/** Owner, for example `user:123` or `org:acme`. */
|
|
43
16
|
scope: column("scope", "string"),
|
|
@@ -82,7 +55,7 @@ var storageFolder = table("storage_folder", {
|
|
|
82
55
|
name: column("name", "string"),
|
|
83
56
|
createdAt: column("created_at", "timestamp").defaultTo$("now")
|
|
84
57
|
}).unique("storage_folder_scope_path_uk", ["scope", "path"]);
|
|
85
|
-
var
|
|
58
|
+
var schemaIndexes = [
|
|
86
59
|
{
|
|
87
60
|
name: "storage_object_scope_folder_idx",
|
|
88
61
|
table: "storage_object",
|
|
@@ -114,44 +87,35 @@ var v2Indexes = [
|
|
|
114
87
|
columns: ["scope", "parent"]
|
|
115
88
|
}
|
|
116
89
|
];
|
|
117
|
-
var v1Indexes = [
|
|
118
|
-
"storage_object_scope_status_created_idx",
|
|
119
|
-
"storage_object_scope_route_idx",
|
|
120
|
-
"storage_object_status_created_idx"
|
|
121
|
-
];
|
|
122
90
|
var custom = (sql) => ({ type: "custom", sql });
|
|
123
|
-
var
|
|
124
|
-
var
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
var afterV2 = [
|
|
130
|
-
...v1Indexes.map((name) => custom(`DROP INDEX IF EXISTS "${name}"`)),
|
|
131
|
-
...v2Indexes.map((index) => {
|
|
132
|
-
const columns = index.columns.map((name) => `"${name}"`).join(", ");
|
|
133
|
-
return custom(
|
|
134
|
-
`CREATE INDEX IF NOT EXISTS "${index.name}" ON "${index.table}" (${columns})`
|
|
135
|
-
);
|
|
136
|
-
})
|
|
137
|
-
];
|
|
138
|
-
var v2 = schema({
|
|
91
|
+
var PREDECESSOR_VERSION = "0.0.1";
|
|
92
|
+
var predecessor = schema({
|
|
93
|
+
version: PREDECESSOR_VERSION,
|
|
94
|
+
tables: {}
|
|
95
|
+
});
|
|
96
|
+
var dbSchema = schema({
|
|
139
97
|
version: "2.0.0",
|
|
140
98
|
tables: {
|
|
141
|
-
storageObject
|
|
99
|
+
storageObject,
|
|
142
100
|
storageFolder
|
|
143
101
|
},
|
|
144
102
|
async up({ auto }) {
|
|
145
|
-
|
|
103
|
+
const indexes = schemaIndexes.map((index) => {
|
|
104
|
+
const columns = index.columns.map((name) => `"${name}"`).join(", ");
|
|
105
|
+
return custom(
|
|
106
|
+
`CREATE INDEX IF NOT EXISTS "${index.name}" ON "${index.table}" (${columns})`
|
|
107
|
+
);
|
|
108
|
+
});
|
|
109
|
+
return [...await auto(), ...indexes];
|
|
146
110
|
}
|
|
147
111
|
});
|
|
148
112
|
|
|
149
113
|
// src/fuma-db.ts
|
|
150
114
|
var DimahS3DB = fumadb({
|
|
151
115
|
namespace: "dimah_s3",
|
|
152
|
-
schemas: [
|
|
116
|
+
schemas: [predecessor, dbSchema]
|
|
153
117
|
});
|
|
154
|
-
var DB_SCHEMA_VERSION =
|
|
118
|
+
var DB_SCHEMA_VERSION = dbSchema.version;
|
|
155
119
|
var FOLDER_PATH_MAX_LENGTH = 1024;
|
|
156
120
|
var FOLDER_NAME_MAX_LENGTH = 255;
|
|
157
121
|
var FOLDER_MAX_DEPTH = 32;
|
|
@@ -815,7 +779,7 @@ async function checkSchemaVersion(client) {
|
|
|
815
779
|
}
|
|
816
780
|
if (version !== DB_SCHEMA_VERSION) {
|
|
817
781
|
throw new Error(
|
|
818
|
-
`[dimah-s3/db] The database is at schema ${version}, but @dimah-s3/db
|
|
782
|
+
`[dimah-s3/db] The database is at schema ${version}, but @dimah-s3/db reads ${DB_SCHEMA_VERSION}. This package does not upgrade another schema. Create it with sql/<dialect>.sql, your ORM's migrations, or migrate(client) from @dimah-s3/db/cli.`
|
|
819
783
|
);
|
|
820
784
|
}
|
|
821
785
|
}
|
|
@@ -851,8 +815,8 @@ function createDbStore(client) {
|
|
|
851
815
|
}
|
|
852
816
|
|
|
853
817
|
// src/standard-schema.ts
|
|
854
|
-
async function validateStandardSchema(
|
|
855
|
-
return
|
|
818
|
+
async function validateStandardSchema(schema2, value) {
|
|
819
|
+
return schema2["~standard"].validate(value);
|
|
856
820
|
}
|
|
857
821
|
function formatStandardIssue(issues) {
|
|
858
822
|
const [issue] = issues;
|
|
@@ -865,10 +829,10 @@ function formatStandardIssue(issues) {
|
|
|
865
829
|
var DB_LIST_MAX_LIMIT = 100;
|
|
866
830
|
var MAX_SEARCH_LENGTH = 255;
|
|
867
831
|
var MAX_CURSOR_LENGTH = 2048;
|
|
868
|
-
function queryInt(
|
|
832
|
+
function queryInt(schema2) {
|
|
869
833
|
return z.codec(
|
|
870
|
-
z.union([z.string().trim().regex(z.regexes.integer),
|
|
871
|
-
|
|
834
|
+
z.union([z.string().trim().regex(z.regexes.integer), schema2]),
|
|
835
|
+
schema2,
|
|
872
836
|
{
|
|
873
837
|
decode: (value) => typeof value === "number" ? value : Number.parseInt(value, 10),
|
|
874
838
|
encode: (value) => value
|
|
@@ -1670,6 +1634,6 @@ function warnUnguardedRoutes(env) {
|
|
|
1670
1634
|
}
|
|
1671
1635
|
}
|
|
1672
1636
|
|
|
1673
|
-
export { DB_SCHEMA_VERSION, DimahS3DB, db
|
|
1637
|
+
export { DB_SCHEMA_VERSION, DimahS3DB, db };
|
|
1674
1638
|
//# sourceMappingURL=index.js.map
|
|
1675
1639
|
//# sourceMappingURL=index.js.map
|