@webiny/api-core-sql 0.0.0-unstable.b6d7105cee → 0.0.0-unstable.e9333b3f0b

package/ApiCoreSqlFeature.d.ts

@@ -0,0 +1,18 @@
+import type { Knex } from "knex";
+export interface ApiCoreSqlConfig {
+    knex: Knex;
+    tableNamePrefix?: string;
+}
+/**
+ * Registers the SQL implementation of ApiCoreStorageOperationsFactory. ApiCoreFeature.register
+ * resolves + builds it. Mirrors ApiCoreDdbFeature.
+ *
+ * The storage operations are built once, here, and `create()` hands out the same object. It runs on
+ * every request (ApiCoreFeature is per-request), and building per request created a new TableManager
+ * each time: every one stayed in the global test registry, so a long-running server leaked one per
+ * request, and each started with no verified tables. The operations hold no per-request state.
+ */
+export declare const ApiCoreSqlFeature: {
+    name: string;
+    register(container: import("@webiny/di").Container, context: ApiCoreSqlConfig): void;
+};

package/ApiCoreSqlFeature.js

@@ -0,0 +1,18 @@
+import { createFeature } from "@webiny/feature/api";
+import { ApiCoreStorageOperationsFactory } from "@webiny/api-core";
+import { createApiCoreSql } from "./createApiCoreSql.js";
+const ApiCoreSqlFeature = createFeature({
+    name: "ApiCoreSql",
+    register (container, { knex, tableNamePrefix }) {
+        const storageOperations = createApiCoreSql({
+            knex,
+            tableNamePrefix
+        });
+        container.registerInstance(ApiCoreStorageOperationsFactory, {
+            create: ()=>storageOperations
+        });
+    }
+});
+export { ApiCoreSqlFeature };
+
+//# sourceMappingURL=ApiCoreSqlFeature.js.map

package/ApiCoreSqlFeature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ApiCoreSqlFeature.js","sources":["../src/ApiCoreSqlFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport type { Knex } from \"knex\";\nimport { ApiCoreStorageOperationsFactory } from \"@webiny/api-core\";\nimport { createApiCoreSql } from \"./createApiCoreSql.js\";\n\nexport interface ApiCoreSqlConfig {\n    knex: Knex;\n    tableNamePrefix?: string;\n}\n\n/**\n * Registers the SQL implementation of ApiCoreStorageOperationsFactory. ApiCoreFeature.register\n * resolves + builds it. Mirrors ApiCoreDdbFeature.\n *\n * The storage operations are built once, here, and `create()` hands out the same object. It runs on\n * every request (ApiCoreFeature is per-request), and building per request created a new TableManager\n * each time: every one stayed in the global test registry, so a long-running server leaked one per\n * request, and each started with no verified tables. The operations hold no per-request state.\n */\nexport const ApiCoreSqlFeature = createFeature<ApiCoreSqlConfig>({\n    name: \"ApiCoreSql\",\n    register(container, { knex, tableNamePrefix }) {\n        const storageOperations = createApiCoreSql({ knex, tableNamePrefix });\n\n        container.registerInstance(ApiCoreStorageOperationsFactory, {\n            create: () => storageOperations\n        });\n    }\n});\n"],"names":["ApiCoreSqlFeature","createFeature","container","knex","tableNamePrefix","storageOperations","createApiCoreSql","ApiCoreStorageOperationsFactory"],"mappings":";;;AAmBO,MAAMA,oBAAoBC,cAAgC;IAC7D,MAAM;IACN,UAASC,SAAS,EAAE,EAAEC,IAAI,EAAEC,eAAe,EAAE;QACzC,MAAMC,oBAAoBC,iBAAiB;YAAEH;YAAMC;QAAgB;QAEnEF,UAAU,gBAAgB,CAACK,iCAAiC;YACxD,QAAQ,IAAMF;QAClB;IACJ;AACJ"}

package/TableManager.d.ts

@@ -8,9 +8,12 @@ export declare class TableManager implements ITableManager {
     private readonly knex;
     private readonly prefix;
     private readonly verified;
+    private readonly pending;
     constructor(knex: Knex, prefix?: string);
     reset(): void;
     resolve(tableName: string): string;
     ensure(tableName: string, creator: (table: Knex.CreateTableBuilder) => void): Promise<void>;
+    private ensureTable;
+    private createTable;
 }
 export {};

package/TableManager.js

@@ -1,6 +1,7 @@
 class TableManager {
     constructor(knex, prefix = ""){
         this.verified = new Set();
+        this.pending = new Map();
         this.knex = knex;
         this.prefix = prefix ? `${prefix}_` : "";
         const g = globalThis;
@@ -9,6 +10,7 @@ class TableManager {
     }
     reset() {
         this.verified.clear();
+        this.pending.clear();
     }
     resolve(tableName) {
         return `${this.prefix}${tableName}`;
@@ -16,10 +18,28 @@ class TableManager {
     async ensure(tableName, creator) {
         const resolved = this.resolve(tableName);
         if (this.verified.has(resolved)) return;
+        const pending = this.pending.get(resolved);
+        if (pending) return pending;
+        const check = this.ensureTable(resolved, creator).finally(()=>{
+            if (this.pending.get(resolved) === check) this.pending.delete(resolved);
+        });
+        this.pending.set(resolved, check);
+        return check;
+    }
+    async ensureTable(resolved, creator) {
         const exists = await this.knex.schema.hasTable(resolved);
-        if (!exists) await this.knex.schema.createTable(resolved, creator);
+        if (!exists) await this.createTable(resolved, creator);
         this.verified.add(resolved);
     }
+    async createTable(resolved, creator) {
+        try {
+            await this.knex.schema.createTable(resolved, creator);
+        } catch (err) {
+            const exists = await this.knex.schema.hasTable(resolved);
+            if (exists) return;
+            throw err;
+        }
+    }
 }
 export { TableManager };
 

package/TableManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableManager.js","sources":["../src/TableManager.ts"],"sourcesContent":["import type { Knex } from \"knex\";\n\ninterface ITableManager {\n    reset(): void;\n    resolve(tableName: string): string;\n    ensure(tableName: string, creator: (table: Knex.CreateTableBuilder) => void): Promise<void>;\n}\n\nexport class TableManager implements ITableManager {\n    private readonly knex: Knex;\n    private readonly prefix: string;\n    private readonly verified = new Set<string>();\n\n    constructor(knex: Knex, prefix: string = \"\") {\n        this.knex = knex;\n        this.prefix = prefix ? `${prefix}_` : \"\";\n\n        const g = globalThis as Record<string, unknown>;\n        const managers = (g.__sqlTableManagers ??= []) as ITableManager[];\n        managers.push(this);\n    }\n\n    public reset(): void {\n        this.verified.clear();\n    }\n\n    public resolve(tableName: string): string {\n        return `${this.prefix}${tableName}`;\n    }\n\n    public async ensure(\n        tableName: string,\n        creator: (table: Knex.CreateTableBuilder) => void\n    ): Promise<void> {\n        const resolved = this.resolve(tableName);\n\n        if (this.verified.has(resolved)) {\n            return;\n        }\n\n        const exists = await this.knex.schema.hasTable(resolved);\n\n        if (!exists) {\n            await this.knex.schema.createTable(resolved, creator);\n        }\n\n        this.verified.add(resolved);\n    }\n}\n"],"names":["TableManager","knex","prefix","Set","g","globalThis","managers","tableName","creator","resolved","exists"],"mappings":"AAQO,MAAMA;IAKT,YAAYC,IAAU,EAAEC,SAAiB,EAAE,CAAE;aAF5B,QAAQ,GAAG,IAAIC;QAG5B,IAAI,CAAC,IAAI,GAAGF;QACZ,IAAI,CAAC,MAAM,GAAGC,SAAS,GAAGA,OAAO,CAAC,CAAC,GAAG;QAEtC,MAAME,IAAIC;QACV,MAAMC,WAAYF,EAAE,kBAAkB,KAAK,EAAE;QAC7CE,SAAS,IAAI,CAAC,IAAI;IACtB;IAEO,QAAc;QACjB,IAAI,CAAC,QAAQ,CAAC,KAAK;IACvB;IAEO,QAAQC,SAAiB,EAAU;QACtC,OAAO,GAAG,IAAI,CAAC,MAAM,GAAGA,WAAW;IACvC;IAEA,MAAa,OACTA,SAAiB,EACjBC,OAAiD,EACpC;QACb,MAAMC,WAAW,IAAI,CAAC,OAAO,CAACF;QAE9B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAACE,WAClB;QAGJ,MAAMC,SAAS,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAACD;QAE/C,IAAI,CAACC,QACD,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAACD,UAAUD;QAGjD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAACC;IACtB;AACJ"}
+{"version":3,"file":"TableManager.js","sources":["../src/TableManager.ts"],"sourcesContent":["import type { Knex } from \"knex\";\n\ninterface ITableManager {\n    reset(): void;\n    resolve(tableName: string): string;\n    ensure(tableName: string, creator: (table: Knex.CreateTableBuilder) => void): Promise<void>;\n}\n\nexport class TableManager implements ITableManager {\n    private readonly knex: Knex;\n    private readonly prefix: string;\n    private readonly verified = new Set<string>();\n    private readonly pending = new Map<string, Promise<void>>();\n\n    constructor(knex: Knex, prefix: string = \"\") {\n        this.knex = knex;\n        this.prefix = prefix ? `${prefix}_` : \"\";\n\n        const g = globalThis as Record<string, unknown>;\n        const managers = (g.__sqlTableManagers ??= []) as ITableManager[];\n        managers.push(this);\n    }\n\n    public reset(): void {\n        this.verified.clear();\n        this.pending.clear();\n    }\n\n    public resolve(tableName: string): string {\n        return `${this.prefix}${tableName}`;\n    }\n\n    public async ensure(\n        tableName: string,\n        creator: (table: Knex.CreateTableBuilder) => void\n    ): Promise<void> {\n        const resolved = this.resolve(tableName);\n\n        if (this.verified.has(resolved)) {\n            return;\n        }\n\n        // One TableManager serves every request, so concurrent first requests share a single\n        // hasTable+createTable instead of racing into \"table already exists\". Cleared on failure so\n        // a later call can retry.\n        const pending = this.pending.get(resolved);\n        if (pending) {\n            return pending;\n        }\n\n        const check = this.ensureTable(resolved, creator).finally(() => {\n            // Only remove our own entry: after reset() a newer check may own this table's slot.\n            if (this.pending.get(resolved) === check) {\n                this.pending.delete(resolved);\n            }\n        });\n        this.pending.set(resolved, check);\n\n        return check;\n    }\n\n    private async ensureTable(\n        resolved: string,\n        creator: (table: Knex.CreateTableBuilder) => void\n    ): Promise<void> {\n        const exists = await this.knex.schema.hasTable(resolved);\n\n        if (!exists) {\n            await this.createTable(resolved, creator);\n        }\n\n        this.verified.add(resolved);\n    }\n\n    private async createTable(\n        resolved: string,\n        creator: (table: Knex.CreateTableBuilder) => void\n    ): Promise<void> {\n        try {\n            await this.knex.schema.createTable(resolved, creator);\n        } catch (err) {\n            // Another process (or connection) may have created it in the meantime. If it exists now,\n            // that's success; otherwise the failure is real.\n            const exists = await this.knex.schema.hasTable(resolved);\n            if (exists) {\n                return;\n            }\n            throw err;\n        }\n    }\n}\n"],"names":["TableManager","knex","prefix","Set","Map","g","globalThis","managers","tableName","creator","resolved","pending","check","exists","err"],"mappings":"AAQO,MAAMA;IAMT,YAAYC,IAAU,EAAEC,SAAiB,EAAE,CAAE;aAH5B,QAAQ,GAAG,IAAIC;aACf,OAAO,GAAG,IAAIC;QAG3B,IAAI,CAAC,IAAI,GAAGH;QACZ,IAAI,CAAC,MAAM,GAAGC,SAAS,GAAGA,OAAO,CAAC,CAAC,GAAG;QAEtC,MAAMG,IAAIC;QACV,MAAMC,WAAYF,EAAE,kBAAkB,KAAK,EAAE;QAC7CE,SAAS,IAAI,CAAC,IAAI;IACtB;IAEO,QAAc;QACjB,IAAI,CAAC,QAAQ,CAAC,KAAK;QACnB,IAAI,CAAC,OAAO,CAAC,KAAK;IACtB;IAEO,QAAQC,SAAiB,EAAU;QACtC,OAAO,GAAG,IAAI,CAAC,MAAM,GAAGA,WAAW;IACvC;IAEA,MAAa,OACTA,SAAiB,EACjBC,OAAiD,EACpC;QACb,MAAMC,WAAW,IAAI,CAAC,OAAO,CAACF;QAE9B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAACE,WAClB;QAMJ,MAAMC,UAAU,IAAI,CAAC,OAAO,CAAC,GAAG,CAACD;QACjC,IAAIC,SACA,OAAOA;QAGX,MAAMC,QAAQ,IAAI,CAAC,WAAW,CAACF,UAAUD,SAAS,OAAO,CAAC;YAEtD,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAACC,cAAcE,OAC/B,IAAI,CAAC,OAAO,CAAC,MAAM,CAACF;QAE5B;QACA,IAAI,CAAC,OAAO,CAAC,GAAG,CAACA,UAAUE;QAE3B,OAAOA;IACX;IAEA,MAAc,YACVF,QAAgB,EAChBD,OAAiD,EACpC;QACb,MAAMI,SAAS,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAACH;QAE/C,IAAI,CAACG,QACD,MAAM,IAAI,CAAC,WAAW,CAACH,UAAUD;QAGrC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAACC;IACtB;IAEA,MAAc,YACVA,QAAgB,EAChBD,OAAiD,EACpC;QACb,IAAI;YACA,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAACC,UAAUD;QACjD,EAAE,OAAOK,KAAK;YAGV,MAAMD,SAAS,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAACH;YAC/C,IAAIG,QACA;YAEJ,MAAMC;QACV;IACJ;AACJ"}

package/index.d.ts

@@ -1,5 +1,7 @@
 import type { Knex } from "knex";
 export { createApiCoreSql } from "./createApiCoreSql.js";
+export { ApiCoreSqlFeature } from "./ApiCoreSqlFeature.js";
+export type { ApiCoreSqlConfig } from "./ApiCoreSqlFeature.js";
 export { getSqlTablePrefix } from "./getSqlTablePrefix.js";
 export { SqlServiceManifestLoader } from "./serviceDiscovery/index.js";
 export { KnexClient } from "./feature/KnexClient/index.js";

package/index.js

@@ -4,6 +4,7 @@ const registerSQLCore = ({ knex })=>createRegisterExtensionPlugin(async (context
         KnexClientFeature.register(context.container, knex);
     });
 export { createApiCoreSql } from "./createApiCoreSql.js";
+export { ApiCoreSqlFeature } from "./ApiCoreSqlFeature.js";
 export { getSqlTablePrefix } from "./getSqlTablePrefix.js";
 export { SqlServiceManifestLoader } from "./serviceDiscovery/index.js";
 export { KnexClient, registerSQLCore };

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../src/index.ts"],"sourcesContent":["import { createRegisterExtensionPlugin } from \"@webiny/handler\";\nimport type { Knex } from \"knex\";\nimport { KnexClientFeature } from \"./feature/KnexClient/index.js\";\n\nexport { createApiCoreSql } from \"./createApiCoreSql.js\";\nexport { getSqlTablePrefix } from \"./getSqlTablePrefix.js\";\nexport { SqlServiceManifestLoader } from \"./serviceDiscovery/index.js\";\n\nexport { KnexClient } from \"./feature/KnexClient/index.js\";\n\ninterface IRegisterApiCoreSqlExtension {\n    knex: Knex;\n}\n\nexport const registerSQLCore = ({ knex }: IRegisterApiCoreSqlExtension) => {\n    return createRegisterExtensionPlugin(async context => {\n        KnexClientFeature.register(context.container, knex);\n    });\n};\n"],"names":["registerSQLCore","knex","createRegisterExtensionPlugin","context","KnexClientFeature"],"mappings":";;AAcO,MAAMA,kBAAkB,CAAC,EAAEC,IAAI,EAAgC,GAC3DC,8BAA8B,OAAMC;QACvCC,kBAAkB,QAAQ,CAACD,QAAQ,SAAS,EAAEF;IAClD"}
+{"version":3,"file":"index.js","sources":["../src/index.ts"],"sourcesContent":["import { createRegisterExtensionPlugin } from \"@webiny/handler\";\nimport type { Knex } from \"knex\";\nimport { KnexClientFeature } from \"./feature/KnexClient/index.js\";\n\nexport { createApiCoreSql } from \"./createApiCoreSql.js\";\nexport { ApiCoreSqlFeature } from \"./ApiCoreSqlFeature.js\";\nexport type { ApiCoreSqlConfig } from \"./ApiCoreSqlFeature.js\";\nexport { getSqlTablePrefix } from \"./getSqlTablePrefix.js\";\nexport { SqlServiceManifestLoader } from \"./serviceDiscovery/index.js\";\n\nexport { KnexClient } from \"./feature/KnexClient/index.js\";\n\ninterface IRegisterApiCoreSqlExtension {\n    knex: Knex;\n}\n\nexport const registerSQLCore = ({ knex }: IRegisterApiCoreSqlExtension) => {\n    return createRegisterExtensionPlugin(async context => {\n        KnexClientFeature.register(context.container, knex);\n    });\n};\n"],"names":["registerSQLCore","knex","createRegisterExtensionPlugin","context","KnexClientFeature"],"mappings":";;AAgBO,MAAMA,kBAAkB,CAAC,EAAEC,IAAI,EAAgC,GAC3DC,8BAA8B,OAAMC;QACvCC,kBAAkB,QAAQ,CAACD,QAAQ,SAAS,EAAEF;IAClD"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-core-sql",
-	"version": "0.0.0-unstable.b6d7105cee",
+	"version": "0.0.0-unstable.e9333b3f0b",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -21,18 +21,17 @@
 	"author": "Webiny Ltd.",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api-core": "0.0.0-unstable.b6d7105cee",
-		"@webiny/error": "0.0.0-unstable.b6d7105cee",
-		"@webiny/feature": "0.0.0-unstable.b6d7105cee",
-		"@webiny/handler": "0.0.0-unstable.b6d7105cee",
+		"@webiny/api-core": "0.0.0-unstable.e9333b3f0b",
+		"@webiny/error": "0.0.0-unstable.e9333b3f0b",
+		"@webiny/feature": "0.0.0-unstable.e9333b3f0b",
+		"@webiny/handler": "0.0.0-unstable.e9333b3f0b",
 		"knex": "3.3.0"
 	},
 	"devDependencies": {
-		"@webiny/build-tools": "0.0.0-unstable.b6d7105cee",
-		"@webiny/project-utils": "0.0.0-unstable.b6d7105cee",
-		"better-sqlite3": "13.0.1",
+		"@webiny/build-tools": "0.0.0-unstable.e9333b3f0b",
+		"better-sqlite3": "13.0.3",
 		"typescript": "7.0.2",
-		"vitest": "4.1.10"
+		"vitest": "4.1.11"
 	},
 	"publishConfig": {
 		"access": "public"