@c9up/archive 0.1.7 → 0.1.8

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.
@@ -2,7 +2,7 @@ import { type GcsConfig } from "./GcsDriver.js";
2
2
  import { type S3Config } from "./S3Driver.js";
3
3
  interface ArchiveContainer {
4
4
  singleton(token: unknown, factory: () => unknown): void;
5
- resolve<T = unknown>(token: unknown): T;
5
+ resolve<T = unknown>(token: unknown): Promise<T>;
6
6
  }
7
7
  interface ArchiveConfigStore {
8
8
  get<T = unknown>(key: string): T | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"ArchiveProvider.d.ts","sourceRoot":"","sources":["../src/ArchiveProvider.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,eAAe,CAAC;AAQxD,UAAU,gBAAgB;IACzB,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,GAAG,IAAI,CAAC;IACxD,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,CAAC,CAAC;CACxC;AACD,UAAU,kBAAkB;IAC3B,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;CAC7C;AACD,MAAM,WAAW,iBAAiB;IACjC,SAAS,EAAE,gBAAgB,CAAC;IAC5B,MAAM,EAAE,kBAAkB,CAAC;CAC3B;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC7B,MAAM,EAAE,OAAO,GAAG,IAAI,GAAG,KAAK,CAAC;IAC/B,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjD,EAAE,CAAC,EAAE,QAAQ,CAAC;IACd,GAAG,CAAC,EAAE,SAAS,CAAC;CAChB;AAOD,MAAM,CAAC,OAAO,OAAO,eAAe;IACvB,SAAS,CAAC,GAAG,EAAE,iBAAiB;gBAAtB,GAAG,EAAE,iBAAiB;IAE5C,QAAQ,IAAI,IAAI;IAkBV,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IACtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAC/B"}
1
+ {"version":3,"file":"ArchiveProvider.d.ts","sourceRoot":"","sources":["../src/ArchiveProvider.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,eAAe,CAAC;AAQxD,UAAU,gBAAgB;IACzB,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,GAAG,IAAI,CAAC;IACxD,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACjD;AACD,UAAU,kBAAkB;IAC3B,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;CAC7C;AACD,MAAM,WAAW,iBAAiB;IACjC,SAAS,EAAE,gBAAgB,CAAC;IAC5B,MAAM,EAAE,kBAAkB,CAAC;CAC3B;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC7B,MAAM,EAAE,OAAO,GAAG,IAAI,GAAG,KAAK,CAAC;IAC/B,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjD,EAAE,CAAC,EAAE,QAAQ,CAAC;IACd,GAAG,CAAC,EAAE,SAAS,CAAC;CAChB;AAOD,MAAM,CAAC,OAAO,OAAO,eAAe;IACvB,SAAS,CAAC,GAAG,EAAE,iBAAiB;gBAAtB,GAAG,EAAE,iBAAiB;IAE5C,QAAQ,IAAI,IAAI;IAkBV,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IACtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAC/B"}
@@ -43,9 +43,9 @@ export default class ArchiveProvider {
43
43
  });
44
44
  // Backward-compatible bindings — the default disk is what apps
45
45
  // previously resolved via `StorageManager` / the `storage` token.
46
- this.app.container.singleton(StorageManager, () => this.app.container.resolve(DriveManager).use());
47
- this.app.container.singleton("storage", () => this.app.container.resolve(StorageManager));
48
- this.app.container.singleton("drive", () => this.app.container.resolve(DriveManager));
46
+ this.app.container.singleton(StorageManager, async () => (await this.app.container.resolve(DriveManager)).use());
47
+ this.app.container.singleton("storage", async () => this.app.container.resolve(StorageManager));
48
+ this.app.container.singleton("drive", async () => this.app.container.resolve(DriveManager));
49
49
  }
50
50
  async boot() {
51
51
  // Skip eager resolution when archive is unconfigured: an app that
@@ -58,7 +58,7 @@ export default class ArchiveProvider {
58
58
  typeof archive !== "object") {
59
59
  return;
60
60
  }
61
- const manager = this.app.container.resolve(StorageManager);
61
+ const manager = await this.app.container.resolve(StorageManager);
62
62
  setStorage(manager);
63
63
  }
64
64
  async start() { }
@@ -1 +1 @@
1
- {"version":3,"file":"ArchiveProvider.js","sourceRoot":"","sources":["../src/ArchiveProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ArchiveProvider.js","sourceRoot":"","sources":["../src/ArchiveProvider.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@c9up/archive",
3
- "version": "0.1.7",
3
+ "version": "0.1.8",
4
4
  "description": "Archive — File storage abstraction for the Ream framework (Local + S3-compatible drivers)",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -35,7 +35,7 @@ import { setStorage } from "./services/main.js";
35
35
 
36
36
  interface ArchiveContainer {
37
37
  singleton(token: unknown, factory: () => unknown): void;
38
- resolve<T = unknown>(token: unknown): T;
38
+ resolve<T = unknown>(token: unknown): Promise<T>;
39
39
  }
40
40
  interface ArchiveConfigStore {
41
41
  get<T = unknown>(key: string): T | undefined;
@@ -73,13 +73,13 @@ export default class ArchiveProvider {
73
73
  });
74
74
  // Backward-compatible bindings — the default disk is what apps
75
75
  // previously resolved via `StorageManager` / the `storage` token.
76
- this.app.container.singleton(StorageManager, () =>
77
- this.app.container.resolve<DriveManager>(DriveManager).use(),
76
+ this.app.container.singleton(StorageManager, async () =>
77
+ (await this.app.container.resolve<DriveManager>(DriveManager)).use(),
78
78
  );
79
- this.app.container.singleton("storage", () =>
79
+ this.app.container.singleton("storage", async () =>
80
80
  this.app.container.resolve<StorageManager>(StorageManager),
81
81
  );
82
- this.app.container.singleton("drive", () =>
82
+ this.app.container.singleton("drive", async () =>
83
83
  this.app.container.resolve<DriveManager>(DriveManager),
84
84
  );
85
85
  }
@@ -97,7 +97,8 @@ export default class ArchiveProvider {
97
97
  ) {
98
98
  return;
99
99
  }
100
- const manager = this.app.container.resolve<StorageManager>(StorageManager);
100
+ const manager =
101
+ await this.app.container.resolve<StorageManager>(StorageManager);
101
102
  setStorage(manager);
102
103
  }
103
104