@_linked/s3 1.2.1 → 1.2.2
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/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @\_linked/s3
|
|
2
2
|
|
|
3
|
+
## 1.2.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#19](https://github.com/linked-fw/s3/pull/19) [`36e930c`](https://github.com/linked-fw/s3/commit/36e930cf28a3b9c3288744a9291a1d7ba509f859) Thanks [@flyon](https://github.com/flyon)! - `S3FileStore` no longer extends `Shape`, and drops its inert `static targetClass`.
|
|
8
|
+
|
|
9
|
+
It used nothing from `Shape`: no `this.id`, no `this.uri`, no `nodeShape`, no Shape
|
|
10
|
+
statics, and no caller treats it as one. `label` is its own field, not an inherited
|
|
11
|
+
one. `targetClass` was already dead — it is only ever read by `@linkedShape`, which
|
|
12
|
+
this class never carried, and `s3:FileStore` is not defined in this package's
|
|
13
|
+
ontology data.
|
|
14
|
+
|
|
15
|
+
The old `super()` minted `${DATA_ROOT}/s3-filestore/${name}` with a comment saying
|
|
16
|
+
the URI had to match between frontend and backend. Nothing read it: the only
|
|
17
|
+
occurrence of that path anywhere in the codebase was the `super()` call itself.
|
|
18
|
+
|
|
19
|
+
Stores and datasets stopped being Shapes deliberately in core `0e8c86e`
|
|
20
|
+
("datasets are not shapes"). No API change — the constructor signature is unchanged
|
|
21
|
+
and the class still implements `IFileStore` in full.
|
|
22
|
+
|
|
3
23
|
## 1.2.1
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { FileStat, IFileStore, SaveFileOptions } from '@_linked/core/interfaces/IFileStore';
|
|
2
|
-
import { Shape } from '@_linked/core/shapes/Shape';
|
|
3
2
|
import { type S3ClientConfigInput } from './S3Bucket.js';
|
|
4
3
|
import type { Readable } from 'stream';
|
|
5
4
|
export interface S3FileStoreConfig {
|
|
@@ -8,8 +7,20 @@ export interface S3FileStoreConfig {
|
|
|
8
7
|
prefix?: string;
|
|
9
8
|
clientConfig?: S3ClientConfigInput;
|
|
10
9
|
}
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
/**
|
|
11
|
+
* A file store is not a Shape.
|
|
12
|
+
*
|
|
13
|
+
* This class used to `extends Shape` and declare `static targetClass = s3.FileStore`,
|
|
14
|
+
* but used nothing from `Shape`: no `this.id`, no `this.uri`, no `nodeShape`, no
|
|
15
|
+
* Shape statics, and no caller treats it as a Shape. `label` is its own field, not
|
|
16
|
+
* an inherited one. The `targetClass` was inert — it is only ever read by
|
|
17
|
+
* `@linkedShape`, which this class never carried, and `s3:FileStore` is not defined
|
|
18
|
+
* in this package's ontology data.
|
|
19
|
+
*
|
|
20
|
+
* Stores and datasets stopped being Shapes deliberately in core `0e8c86e`
|
|
21
|
+
* ("datasets are not shapes").
|
|
22
|
+
*/
|
|
23
|
+
export declare class S3FileStore implements IFileStore {
|
|
13
24
|
label: string;
|
|
14
25
|
private _bucket;
|
|
15
26
|
private readonly config;
|
|
@@ -1,21 +1,30 @@
|
|
|
1
1
|
import { normalizeSaveFileOptions, } from '@_linked/core/interfaces/IFileStore';
|
|
2
|
-
import { Shape } from '@_linked/core/shapes/Shape';
|
|
3
2
|
import mime from 'mime';
|
|
4
3
|
import path from 'path';
|
|
5
|
-
import { s3 } from '../ontologies/s3.js';
|
|
6
4
|
import { S3Bucket } from './S3Bucket.js';
|
|
7
5
|
const trimSlashes = (value = '') => value.replace(/^\/+|\/+$/g, '');
|
|
8
6
|
const trimTrailingSlash = (value = '') => value.replace(/\/+$/g, '');
|
|
9
|
-
|
|
7
|
+
/**
|
|
8
|
+
* A file store is not a Shape.
|
|
9
|
+
*
|
|
10
|
+
* This class used to `extends Shape` and declare `static targetClass = s3.FileStore`,
|
|
11
|
+
* but used nothing from `Shape`: no `this.id`, no `this.uri`, no `nodeShape`, no
|
|
12
|
+
* Shape statics, and no caller treats it as a Shape. `label` is its own field, not
|
|
13
|
+
* an inherited one. The `targetClass` was inert — it is only ever read by
|
|
14
|
+
* `@linkedShape`, which this class never carried, and `s3:FileStore` is not defined
|
|
15
|
+
* in this package's ontology data.
|
|
16
|
+
*
|
|
17
|
+
* Stores and datasets stopped being Shapes deliberately in core `0e8c86e`
|
|
18
|
+
* ("datasets are not shapes").
|
|
19
|
+
*/
|
|
20
|
+
export class S3FileStore {
|
|
10
21
|
constructor(n, config = {}) {
|
|
22
|
+
// The old `super()` minted `${DATA_ROOT}/s3-filestore/${n}` with a comment
|
|
23
|
+
// claiming the URI had to match between frontend and backend. Nothing ever
|
|
24
|
+
// read it — the only occurrence in the codebase was the `super()` call itself.
|
|
11
25
|
if (typeof n === 'string') {
|
|
12
|
-
//set a fixed URI. This is important because the URI needs to match on the frontend and backend
|
|
13
|
-
super(`${process.env.DATA_ROOT}/s3-filestore/${n}`);
|
|
14
26
|
this.label = n;
|
|
15
27
|
}
|
|
16
|
-
else {
|
|
17
|
-
super(n);
|
|
18
|
-
}
|
|
19
28
|
this.config = config;
|
|
20
29
|
this.accessURL = this.resolveAccessURL();
|
|
21
30
|
}
|
|
@@ -211,5 +220,4 @@ export class S3FileStore extends Shape {
|
|
|
211
220
|
};
|
|
212
221
|
}
|
|
213
222
|
}
|
|
214
|
-
S3FileStore.targetClass = s3.FileStore;
|
|
215
223
|
//# sourceMappingURL=S3FileStore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3FileStore.js","sourceRoot":"","sources":["../../../src/shapes/S3FileStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,wBAAwB,GACzB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,
|
|
1
|
+
{"version":3,"file":"S3FileStore.js","sourceRoot":"","sources":["../../../src/shapes/S3FileStore.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"type": "git",
|
|
12
12
|
"url": "git+https://github.com/linked-fw/s3.git"
|
|
13
13
|
},
|
|
14
|
-
"version": "1.2.
|
|
14
|
+
"version": "1.2.2",
|
|
15
15
|
"packageManager": "npm@11.19.1",
|
|
16
16
|
"linkedPackage": true,
|
|
17
17
|
"type": "module",
|
|
@@ -21,10 +21,10 @@
|
|
|
21
21
|
"scripts": {
|
|
22
22
|
"start": "npm exec linked dev",
|
|
23
23
|
"build": "rimraf ./lib && npm run build-esm && npm run copy-to-lib",
|
|
24
|
-
"build-esm": "echo \"compiling ESM\" && rimraf ./lib/esm &&
|
|
24
|
+
"build-esm": "echo \"compiling ESM\" && rimraf ./lib/esm && tsc -p tsconfig-esm.json",
|
|
25
25
|
"copy-to-lib": "echo 'copying JSON assets to lib folder' && copyfiles -u 1 'src/**/*.json' lib/esm",
|
|
26
|
-
"test": "NODE_OPTIONS=--experimental-vm-modules
|
|
27
|
-
"typecheck": "
|
|
26
|
+
"test": "NODE_OPTIONS=--experimental-vm-modules jest --config jest.config.cjs && npm run typecheck",
|
|
27
|
+
"typecheck": "tsc -p tsconfig-tests.json"
|
|
28
28
|
},
|
|
29
29
|
"keywords": [
|
|
30
30
|
"lincd",
|
|
@@ -38,8 +38,8 @@
|
|
|
38
38
|
"aws"
|
|
39
39
|
],
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@_linked/core": "^2.
|
|
42
|
-
"@_linked/server": "^2.
|
|
41
|
+
"@_linked/core": "^2.21.0",
|
|
42
|
+
"@_linked/server": "^2.5.1",
|
|
43
43
|
"@_linked/server-utils": "^1.0",
|
|
44
44
|
"@aws-sdk/client-s3": "^3.159.0",
|
|
45
45
|
"@aws-sdk/credential-providers": "^3.159.0",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"mime": "2.6.0"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
-
"@_linked/cli": "^1.
|
|
50
|
+
"@_linked/cli": "^1.19.0",
|
|
51
51
|
"@changesets/changelog-github": "^0.5.2",
|
|
52
52
|
"@changesets/cli": "^2.29.8",
|
|
53
53
|
"@jest/globals": "^29.7.0",
|