@s-hirano-ist/s-scripts 1.25.1 → 1.26.0
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 +73 -0
- package/configs/oxfmt.json +9 -0
- package/dist/cleanup-minio-images.js +1 -1
- package/dist/cleanup-minio-images.js.map +1 -1
- package/dist/enrich-books.js +2 -2
- package/dist/enrich-books.js.map +1 -1
- package/dist/fix-book-frontmatter.js +2 -2
- package/dist/fix-book-frontmatter.js.map +1 -1
- package/dist/fix-image-formats.js +7 -3
- package/dist/fix-image-formats.js.map +1 -1
- package/dist/infrastructures/articles-command-repository.d.ts +11 -11
- package/dist/infrastructures/articles-command-repository.d.ts.map +1 -1
- package/dist/infrastructures/books-command-repository.d.ts +11 -11
- package/dist/infrastructures/books-command-repository.d.ts.map +1 -1
- package/dist/infrastructures/cache-invalidation-client.d.ts +1 -1
- package/dist/infrastructures/cache-invalidation-client.d.ts.map +1 -1
- package/dist/infrastructures/images-command-repository.d.ts +11 -11
- package/dist/infrastructures/images-command-repository.d.ts.map +1 -1
- package/dist/infrastructures/notes-command-repository.d.ts +11 -11
- package/dist/infrastructures/notes-command-repository.d.ts.map +1 -1
- package/dist/ingest-books.js +9 -10
- package/dist/ingest-books.js.map +1 -1
- package/dist/ingest-images.js +9 -12
- package/dist/ingest-images.js.map +1 -1
- package/dist/ingest-notes.js +7 -20
- package/dist/ingest-notes.js.map +1 -1
- package/dist/s-content-format-runner.d.ts +7 -0
- package/dist/s-content-format-runner.d.ts.map +1 -0
- package/dist/s-content-format-runner.js +77 -0
- package/dist/s-content-format-runner.js.map +1 -0
- package/dist/s-content-format.js +15 -42
- package/dist/s-content-format.js.map +1 -1
- package/dist/s-content-format.test.d.ts +2 -0
- package/dist/s-content-format.test.d.ts.map +1 -0
- package/dist/s-content-format.test.js +93 -0
- package/dist/s-content-format.test.js.map +1 -0
- package/package.json +10 -12
- package/configs/dprint.json +0 -22
package/README.md
ADDED
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
# @s-hirano-ist/s-scripts
|
|
2
|
+
|
|
3
|
+
CLI scripts for s-private data operations.
|
|
4
|
+
|
|
5
|
+
## Installation
|
|
6
|
+
|
|
7
|
+
```sh
|
|
8
|
+
pnpm add @s-hirano-ist/s-scripts
|
|
9
|
+
```
|
|
10
|
+
|
|
11
|
+
## Commands
|
|
12
|
+
|
|
13
|
+
### Content
|
|
14
|
+
|
|
15
|
+
```sh
|
|
16
|
+
s-content-format
|
|
17
|
+
fetch-articles
|
|
18
|
+
fetch-books
|
|
19
|
+
fetch-images
|
|
20
|
+
fetch-notes
|
|
21
|
+
```
|
|
22
|
+
|
|
23
|
+
### Ingest
|
|
24
|
+
|
|
25
|
+
```sh
|
|
26
|
+
ingest-articles
|
|
27
|
+
ingest-books
|
|
28
|
+
ingest-images
|
|
29
|
+
ingest-notes
|
|
30
|
+
```
|
|
31
|
+
|
|
32
|
+
### Reset
|
|
33
|
+
|
|
34
|
+
```sh
|
|
35
|
+
reset-articles
|
|
36
|
+
reset-books
|
|
37
|
+
reset-images
|
|
38
|
+
reset-notes
|
|
39
|
+
```
|
|
40
|
+
|
|
41
|
+
### Revert
|
|
42
|
+
|
|
43
|
+
```sh
|
|
44
|
+
revert-articles
|
|
45
|
+
revert-books
|
|
46
|
+
revert-images
|
|
47
|
+
revert-notes
|
|
48
|
+
```
|
|
49
|
+
|
|
50
|
+
### RAG
|
|
51
|
+
|
|
52
|
+
```sh
|
|
53
|
+
rag-ingest
|
|
54
|
+
rag-search
|
|
55
|
+
rag-delete-collection
|
|
56
|
+
```
|
|
57
|
+
|
|
58
|
+
### Maintenance
|
|
59
|
+
|
|
60
|
+
```sh
|
|
61
|
+
cleanup-minio-images
|
|
62
|
+
enrich-books
|
|
63
|
+
find-duplicate-json-articles
|
|
64
|
+
fix-book-frontmatter
|
|
65
|
+
fix-image-formats
|
|
66
|
+
update-json-articles
|
|
67
|
+
update-raw-articles
|
|
68
|
+
validate-json-articles
|
|
69
|
+
```
|
|
70
|
+
|
|
71
|
+
## License
|
|
72
|
+
|
|
73
|
+
AGPL-3.0
|
|
@@ -8,7 +8,7 @@ const ORIGINAL_IMAGE_PATH = "images/original";
|
|
|
8
8
|
const THUMBNAIL_IMAGE_PATH = "images/thumbnail";
|
|
9
9
|
function isImageFile(filePath) {
|
|
10
10
|
const ext = extname(filePath).toLowerCase();
|
|
11
|
-
return [".jpg", ".jpeg", ".png", ".
|
|
11
|
+
return [".jpg", ".jpeg", ".png", ".webp"].includes(ext);
|
|
12
12
|
}
|
|
13
13
|
function listObjects(client, bucket, prefix) {
|
|
14
14
|
return new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanup-minio-images.js","sourceRoot":"","sources":["../src/cleanup-minio-images.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAoB,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,WAAW,GAAG,sBAAsB,CAAC;AAE3C,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAC9C,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AAEhD,SAAS,WAAW,CAAC,QAAgB;IACpC,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5C,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"cleanup-minio-images.js","sourceRoot":"","sources":["../src/cleanup-minio-images.ts"],"names":[],"mappings":"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"}
|
package/dist/enrich-books.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { books as googleBooksApis } from "@googleapis/books";
|
|
3
|
+
import { parseMarkdownFrontmatter } from "@s-hirano-ist/s-search/frontmatter";
|
|
3
4
|
import { glob } from "glob";
|
|
4
|
-
import matter from "gray-matter";
|
|
5
5
|
import { dump } from "js-yaml";
|
|
6
6
|
/**
|
|
7
7
|
* markdown/book/*.md の frontmatter について、毎回 Google Books API を呼び出して
|
|
@@ -44,7 +44,7 @@ async function main() {
|
|
|
44
44
|
const isbn = basename(filePath, ".md");
|
|
45
45
|
try {
|
|
46
46
|
const raw = await readFile(filePath, "utf8");
|
|
47
|
-
const parsed =
|
|
47
|
+
const parsed = parseMarkdownFrontmatter(raw);
|
|
48
48
|
const data = parsed.data;
|
|
49
49
|
console.log(`🔍 ${fileName}: Google Books API 問い合わせ中...`);
|
|
50
50
|
const book = await api.volumes.list({ q: `isbn:${isbn}` });
|
package/dist/enrich-books.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enrich-books.js","sourceRoot":"","sources":["../src/enrich-books.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"enrich-books.js","sourceRoot":"","sources":["../src/enrich-books.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
+
import { parseMarkdownFrontmatter } from "@s-hirano-ist/s-search/frontmatter";
|
|
2
3
|
import { glob } from "glob";
|
|
3
|
-
import matter from "gray-matter";
|
|
4
4
|
import { dump } from "js-yaml";
|
|
5
5
|
import { readFile, writeFile } from "node:fs/promises";
|
|
6
6
|
import { basename, join } from "node:path";
|
|
@@ -61,7 +61,7 @@ async function processFile(filePath, dryRun) {
|
|
|
61
61
|
const isbn = basename(filePath, ".md");
|
|
62
62
|
try {
|
|
63
63
|
const raw = await readFile(filePath, "utf8");
|
|
64
|
-
const parsed =
|
|
64
|
+
const parsed = parseMarkdownFrontmatter(raw);
|
|
65
65
|
const existing = parsed.data;
|
|
66
66
|
const hasAllKeys = REQUIRED_KEYS.every((k) => Object.hasOwn(existing, k));
|
|
67
67
|
const hasLegacyKeys = LEGACY_KEYS.some((k) => Object.hasOwn(existing, k));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-book-frontmatter.js","sourceRoot":"","sources":["../src/fix-book-frontmatter.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"fix-book-frontmatter.js","sourceRoot":"","sources":["../src/fix-book-frontmatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
+
import { convertToWebp as convertImageToWebp } from "@s-hirano-ist/s-image-processing/node";
|
|
2
3
|
import { glob } from "glob";
|
|
3
|
-
import { stat, unlink } from "node:fs/promises";
|
|
4
|
+
import { readFile, stat, unlink, writeFile } from "node:fs/promises";
|
|
4
5
|
import { basename, extname, join } from "node:path";
|
|
5
|
-
import sharp from "sharp";
|
|
6
6
|
const WEBP_QUALITY = 80;
|
|
7
7
|
function isConvertibleImage(filePath) {
|
|
8
8
|
const ext = extname(filePath).toLowerCase();
|
|
@@ -13,7 +13,11 @@ function getWebpOutputPath(filePath) {
|
|
|
13
13
|
return `${filePath.slice(0, -ext.length)}.webp`;
|
|
14
14
|
}
|
|
15
15
|
async function convertToWebp(inputPath, outputPath) {
|
|
16
|
-
|
|
16
|
+
const inputBytes = await readFile(inputPath);
|
|
17
|
+
const outputBytes = await convertImageToWebp(inputBytes, {
|
|
18
|
+
quality: WEBP_QUALITY,
|
|
19
|
+
});
|
|
20
|
+
await writeFile(outputPath, outputBytes);
|
|
17
21
|
}
|
|
18
22
|
async function processDirectory(directory, label, dryRun) {
|
|
19
23
|
const files = await glob(`${directory}/*`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-image-formats.js","sourceRoot":"","sources":["../src/fix-image-formats.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"fix-image-formats.js","sourceRoot":"","sources":["../src/fix-image-formats.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,27 +9,27 @@ import { type Status } from "@s-hirano-ist/s-database";
|
|
|
9
9
|
* Uses a generic approach to accept Prisma's strict typing.
|
|
10
10
|
*/
|
|
11
11
|
type PrismaClientLike = {
|
|
12
|
+
$transaction: <T extends Promise<{
|
|
13
|
+
count: number;
|
|
14
|
+
}>[]>(queries: [...T]) => Promise<{
|
|
15
|
+
[K in keyof T]: {
|
|
16
|
+
count: number;
|
|
17
|
+
};
|
|
18
|
+
}>;
|
|
12
19
|
article: {
|
|
13
20
|
updateMany: (args: {
|
|
14
|
-
|
|
15
|
-
|
|
21
|
+
data: {
|
|
22
|
+
exportedAt?: Date;
|
|
16
23
|
status: Status;
|
|
17
24
|
};
|
|
18
|
-
|
|
25
|
+
where: {
|
|
19
26
|
status: Status;
|
|
20
|
-
|
|
27
|
+
userId: string;
|
|
21
28
|
};
|
|
22
29
|
}) => Promise<{
|
|
23
30
|
count: number;
|
|
24
31
|
}>;
|
|
25
32
|
};
|
|
26
|
-
$transaction: <T extends Promise<{
|
|
27
|
-
count: number;
|
|
28
|
-
}>[]>(queries: [...T]) => Promise<{
|
|
29
|
-
[K in keyof T]: {
|
|
30
|
-
count: number;
|
|
31
|
-
};
|
|
32
|
-
}>;
|
|
33
33
|
};
|
|
34
34
|
/**
|
|
35
35
|
* Creates an Articles batch command repository for bulk operations.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"articles-command-repository.d.ts","sourceRoot":"","sources":["../../src/infrastructures/articles-command-repository.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEX,uBAAuB,EAGvB,MAAM,oFAAoF,CAAC;AAC5F,OAAO,EAAE,KAAK,MAAM,EAAwB,MAAM,0BAA0B,CAAC;AAE7E;;;;;;;GAOG;AACH,KAAK,gBAAgB,GAAG;IACvB,
|
|
1
|
+
{"version":3,"file":"articles-command-repository.d.ts","sourceRoot":"","sources":["../../src/infrastructures/articles-command-repository.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEX,uBAAuB,EAGvB,MAAM,oFAAoF,CAAC;AAC5F,OAAO,EAAE,KAAK,MAAM,EAAwB,MAAM,0BAA0B,CAAC;AAE7E;;;;;;;GAOG;AACH,KAAK,gBAAgB,GAAG;IACvB,YAAY,EAAE,CAAC,CAAC,SAAS,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,EACpD,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,KACX,OAAO,CAAC;SAAG,CAAC,IAAI,MAAM,CAAC,GAAG;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE;KAAE,CAAC,CAAC;IACpD,OAAO,EAAE;QACR,UAAU,EAAE,CAAC,IAAI,EAAE;YAClB,IAAI,EAAE;gBAAE,UAAU,CAAC,EAAE,IAAI,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC;YAC5C,KAAK,EAAE;gBAAE,MAAM,EAAE,MAAM,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC;SAC1C,KAAK,OAAO,CAAC;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACjC,CAAC;CACF,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,+BAA+B,CAC9C,MAAM,EAAE,gBAAgB,GACtB,uBAAuB,CAuDzB"}
|
|
@@ -1,27 +1,27 @@
|
|
|
1
1
|
import type { IBatchCommandRepository } from "@s-hirano-ist/s-core/shared-kernel/repositories/batch-command-repository.interface";
|
|
2
2
|
import { type Status } from "@s-hirano-ist/s-database";
|
|
3
3
|
type PrismaClientLike = {
|
|
4
|
+
$transaction: <T extends Promise<{
|
|
5
|
+
count: number;
|
|
6
|
+
}>[]>(queries: [...T]) => Promise<{
|
|
7
|
+
[K in keyof T]: {
|
|
8
|
+
count: number;
|
|
9
|
+
};
|
|
10
|
+
}>;
|
|
4
11
|
book: {
|
|
5
12
|
updateMany: (args: {
|
|
6
|
-
|
|
7
|
-
|
|
13
|
+
data: {
|
|
14
|
+
exportedAt?: Date;
|
|
8
15
|
status: Status;
|
|
9
16
|
};
|
|
10
|
-
|
|
17
|
+
where: {
|
|
11
18
|
status: Status;
|
|
12
|
-
|
|
19
|
+
userId: string;
|
|
13
20
|
};
|
|
14
21
|
}) => Promise<{
|
|
15
22
|
count: number;
|
|
16
23
|
}>;
|
|
17
24
|
};
|
|
18
|
-
$transaction: <T extends Promise<{
|
|
19
|
-
count: number;
|
|
20
|
-
}>[]>(queries: [...T]) => Promise<{
|
|
21
|
-
[K in keyof T]: {
|
|
22
|
-
count: number;
|
|
23
|
-
};
|
|
24
|
-
}>;
|
|
25
25
|
};
|
|
26
26
|
/**
|
|
27
27
|
* Creates a Books batch command repository for bulk operations.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"books-command-repository.d.ts","sourceRoot":"","sources":["../../src/infrastructures/books-command-repository.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEX,uBAAuB,EAGvB,MAAM,oFAAoF,CAAC;AAC5F,OAAO,EAAE,KAAK,MAAM,EAAwB,MAAM,0BAA0B,CAAC;AAE7E,KAAK,gBAAgB,GAAG;IACvB,
|
|
1
|
+
{"version":3,"file":"books-command-repository.d.ts","sourceRoot":"","sources":["../../src/infrastructures/books-command-repository.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEX,uBAAuB,EAGvB,MAAM,oFAAoF,CAAC;AAC5F,OAAO,EAAE,KAAK,MAAM,EAAwB,MAAM,0BAA0B,CAAC;AAE7E,KAAK,gBAAgB,GAAG;IACvB,YAAY,EAAE,CAAC,CAAC,SAAS,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,EACpD,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,KACX,OAAO,CAAC;SAAG,CAAC,IAAI,MAAM,CAAC,GAAG;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE;KAAE,CAAC,CAAC;IACpD,IAAI,EAAE;QACL,UAAU,EAAE,CAAC,IAAI,EAAE;YAClB,IAAI,EAAE;gBAAE,UAAU,CAAC,EAAE,IAAI,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC;YAC5C,KAAK,EAAE;gBAAE,MAAM,EAAE,MAAM,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC;SAC1C,KAAK,OAAO,CAAC;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACjC,CAAC;CACF,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC3C,MAAM,EAAE,gBAAgB,GACtB,uBAAuB,CAuDzB"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export declare const CACHE_INVALIDATION_DOMAINS: readonly ["articles", "books", "images", "notes"];
|
|
2
2
|
export type CacheInvalidationDomain = (typeof CACHE_INVALIDATION_DOMAINS)[number];
|
|
3
3
|
type CacheInvalidationConfig = Readonly<{
|
|
4
|
-
url: string;
|
|
5
4
|
secret: string;
|
|
5
|
+
url: string;
|
|
6
6
|
}>;
|
|
7
7
|
export declare function invalidateContentCache(config: CacheInvalidationConfig, domain: CacheInvalidationDomain, userId: string, fetchImplementation?: typeof fetch): Promise<void>;
|
|
8
8
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-invalidation-client.d.ts","sourceRoot":"","sources":["../../src/infrastructures/cache-invalidation-client.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,0BAA0B,mDAK7B,CAAC;AAEX,MAAM,MAAM,uBAAuB,GAClC,CAAC,OAAO,0BAA0B,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7C,KAAK,uBAAuB,GAAG,QAAQ,CAAC;IACvC,
|
|
1
|
+
{"version":3,"file":"cache-invalidation-client.d.ts","sourceRoot":"","sources":["../../src/infrastructures/cache-invalidation-client.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,0BAA0B,mDAK7B,CAAC;AAEX,MAAM,MAAM,uBAAuB,GAClC,CAAC,OAAO,0BAA0B,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7C,KAAK,uBAAuB,GAAG,QAAQ,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACZ,CAAC,CAAC;AAEH,wBAAsB,sBAAsB,CAC3C,MAAM,EAAE,uBAAuB,EAC/B,MAAM,EAAE,uBAAuB,EAC/B,MAAM,EAAE,MAAM,EACd,mBAAmB,GAAE,OAAO,KAAa,GACvC,OAAO,CAAC,IAAI,CAAC,CAgBf"}
|
|
@@ -1,27 +1,27 @@
|
|
|
1
1
|
import type { IBatchCommandRepository } from "@s-hirano-ist/s-core/shared-kernel/repositories/batch-command-repository.interface";
|
|
2
2
|
import { type Status } from "@s-hirano-ist/s-database";
|
|
3
3
|
type PrismaClientLike = {
|
|
4
|
+
$transaction: <T extends Promise<{
|
|
5
|
+
count: number;
|
|
6
|
+
}>[]>(queries: [...T]) => Promise<{
|
|
7
|
+
[K in keyof T]: {
|
|
8
|
+
count: number;
|
|
9
|
+
};
|
|
10
|
+
}>;
|
|
4
11
|
image: {
|
|
5
12
|
updateMany: (args: {
|
|
6
|
-
|
|
7
|
-
|
|
13
|
+
data: {
|
|
14
|
+
exportedAt?: Date;
|
|
8
15
|
status: Status;
|
|
9
16
|
};
|
|
10
|
-
|
|
17
|
+
where: {
|
|
11
18
|
status: Status;
|
|
12
|
-
|
|
19
|
+
userId: string;
|
|
13
20
|
};
|
|
14
21
|
}) => Promise<{
|
|
15
22
|
count: number;
|
|
16
23
|
}>;
|
|
17
24
|
};
|
|
18
|
-
$transaction: <T extends Promise<{
|
|
19
|
-
count: number;
|
|
20
|
-
}>[]>(queries: [...T]) => Promise<{
|
|
21
|
-
[K in keyof T]: {
|
|
22
|
-
count: number;
|
|
23
|
-
};
|
|
24
|
-
}>;
|
|
25
25
|
};
|
|
26
26
|
/**
|
|
27
27
|
* Creates an Images batch command repository for bulk operations.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"images-command-repository.d.ts","sourceRoot":"","sources":["../../src/infrastructures/images-command-repository.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEX,uBAAuB,EAGvB,MAAM,oFAAoF,CAAC;AAC5F,OAAO,EAAE,KAAK,MAAM,EAAwB,MAAM,0BAA0B,CAAC;AAE7E,KAAK,gBAAgB,GAAG;IACvB,
|
|
1
|
+
{"version":3,"file":"images-command-repository.d.ts","sourceRoot":"","sources":["../../src/infrastructures/images-command-repository.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEX,uBAAuB,EAGvB,MAAM,oFAAoF,CAAC;AAC5F,OAAO,EAAE,KAAK,MAAM,EAAwB,MAAM,0BAA0B,CAAC;AAE7E,KAAK,gBAAgB,GAAG;IACvB,YAAY,EAAE,CAAC,CAAC,SAAS,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,EACpD,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,KACX,OAAO,CAAC;SAAG,CAAC,IAAI,MAAM,CAAC,GAAG;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE;KAAE,CAAC,CAAC;IACpD,KAAK,EAAE;QACN,UAAU,EAAE,CAAC,IAAI,EAAE;YAClB,IAAI,EAAE;gBAAE,UAAU,CAAC,EAAE,IAAI,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC;YAC5C,KAAK,EAAE;gBAAE,MAAM,EAAE,MAAM,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC;SAC1C,KAAK,OAAO,CAAC;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACjC,CAAC;CACF,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC5C,MAAM,EAAE,gBAAgB,GACtB,uBAAuB,CAuDzB"}
|
|
@@ -1,27 +1,27 @@
|
|
|
1
1
|
import type { IBatchCommandRepository } from "@s-hirano-ist/s-core/shared-kernel/repositories/batch-command-repository.interface";
|
|
2
2
|
import { type Status } from "@s-hirano-ist/s-database";
|
|
3
3
|
type PrismaClientLike = {
|
|
4
|
+
$transaction: <T extends Promise<{
|
|
5
|
+
count: number;
|
|
6
|
+
}>[]>(queries: [...T]) => Promise<{
|
|
7
|
+
[K in keyof T]: {
|
|
8
|
+
count: number;
|
|
9
|
+
};
|
|
10
|
+
}>;
|
|
4
11
|
note: {
|
|
5
12
|
updateMany: (args: {
|
|
6
|
-
|
|
7
|
-
|
|
13
|
+
data: {
|
|
14
|
+
exportedAt?: Date;
|
|
8
15
|
status: Status;
|
|
9
16
|
};
|
|
10
|
-
|
|
17
|
+
where: {
|
|
11
18
|
status: Status;
|
|
12
|
-
|
|
19
|
+
userId: string;
|
|
13
20
|
};
|
|
14
21
|
}) => Promise<{
|
|
15
22
|
count: number;
|
|
16
23
|
}>;
|
|
17
24
|
};
|
|
18
|
-
$transaction: <T extends Promise<{
|
|
19
|
-
count: number;
|
|
20
|
-
}>[]>(queries: [...T]) => Promise<{
|
|
21
|
-
[K in keyof T]: {
|
|
22
|
-
count: number;
|
|
23
|
-
};
|
|
24
|
-
}>;
|
|
25
25
|
};
|
|
26
26
|
/**
|
|
27
27
|
* Creates a Notes batch command repository for bulk operations.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notes-command-repository.d.ts","sourceRoot":"","sources":["../../src/infrastructures/notes-command-repository.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEX,uBAAuB,EAGvB,MAAM,oFAAoF,CAAC;AAC5F,OAAO,EAAE,KAAK,MAAM,EAAwB,MAAM,0BAA0B,CAAC;AAE7E,KAAK,gBAAgB,GAAG;IACvB,
|
|
1
|
+
{"version":3,"file":"notes-command-repository.d.ts","sourceRoot":"","sources":["../../src/infrastructures/notes-command-repository.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEX,uBAAuB,EAGvB,MAAM,oFAAoF,CAAC;AAC5F,OAAO,EAAE,KAAK,MAAM,EAAwB,MAAM,0BAA0B,CAAC;AAE7E,KAAK,gBAAgB,GAAG;IACvB,YAAY,EAAE,CAAC,CAAC,SAAS,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,EACpD,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,KACX,OAAO,CAAC;SAAG,CAAC,IAAI,MAAM,CAAC,GAAG;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE;KAAE,CAAC,CAAC;IACpD,IAAI,EAAE;QACL,UAAU,EAAE,CAAC,IAAI,EAAE;YAClB,IAAI,EAAE;gBAAE,UAAU,CAAC,EAAE,IAAI,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC;YAC5C,KAAK,EAAE;gBAAE,MAAM,EAAE,MAAM,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC;SAC1C,KAAK,OAAO,CAAC;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACjC,CAAC;CACF,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC3C,MAAM,EAAE,gBAAgB,GACtB,uBAAuB,CAuDzB"}
|
package/dist/ingest-books.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { makeISBN } from "@s-hirano-ist/s-core/books/entities/book-entity";
|
|
3
3
|
import { makeExportedStatus, makeId, makeUserId, } from "@s-hirano-ist/s-core/shared-kernel/entities/common-entity";
|
|
4
|
+
import { createWebpThumbnail } from "@s-hirano-ist/s-image-processing/node";
|
|
4
5
|
import { createPushoverService } from "@s-hirano-ist/s-notification";
|
|
6
|
+
import { parseMarkdownFrontmatter } from "@s-hirano-ist/s-search/frontmatter";
|
|
5
7
|
import { createMinioClient } from "@s-hirano-ist/s-storage";
|
|
6
8
|
import { glob } from "glob";
|
|
7
|
-
import matter from "gray-matter";
|
|
8
9
|
import { readFile } from "node:fs/promises";
|
|
9
10
|
import { basename, extname } from "node:path";
|
|
10
|
-
import sharp from "sharp";
|
|
11
11
|
const SCRIPT_NAME = "ingest-books";
|
|
12
12
|
const ORIGINAL_BOOK_IMAGE_PATH = "books/original";
|
|
13
13
|
const THUMBNAIL_BOOK_IMAGE_PATH = "books/thumbnail";
|
|
@@ -20,8 +20,6 @@ function getContentType(filePath) {
|
|
|
20
20
|
return "image/jpeg";
|
|
21
21
|
case ".png":
|
|
22
22
|
return "image/png";
|
|
23
|
-
case ".gif":
|
|
24
|
-
return "image/gif";
|
|
25
23
|
case ".webp":
|
|
26
24
|
return "image/webp";
|
|
27
25
|
default:
|
|
@@ -38,7 +36,7 @@ function arrayEquals(a, b) {
|
|
|
38
36
|
return true;
|
|
39
37
|
}
|
|
40
38
|
function parseBookFile(content) {
|
|
41
|
-
const parsed =
|
|
39
|
+
const parsed = parseMarkdownFrontmatter(content);
|
|
42
40
|
const data = parsed.data;
|
|
43
41
|
// title: frontmatter.title を優先、無ければ本文の H1 からフォールバック
|
|
44
42
|
let title = data.title?.trim() ?? "";
|
|
@@ -47,7 +45,7 @@ function parseBookFile(content) {
|
|
|
47
45
|
title = h1Match ? h1Match[1].trim() : "";
|
|
48
46
|
}
|
|
49
47
|
const body = parsed.content.trim();
|
|
50
|
-
// oxlint-disable-next-line typescript/no-unnecessary-condition --
|
|
48
|
+
// oxlint-disable-next-line typescript/no-unnecessary-condition -- frontmatter is untrusted YAML; rating can be null at runtime despite the declared type
|
|
51
49
|
if (data.rating === undefined || data.rating === null) {
|
|
52
50
|
throw new Error("rating は必須です (frontmatter に rating フィールドがありません)");
|
|
53
51
|
}
|
|
@@ -117,11 +115,12 @@ async function main() {
|
|
|
117
115
|
await minioClient.putObject(bucketName, originalKey, buffer);
|
|
118
116
|
console.log(`📤 MinIO アップロード（original）: ${fileName}`);
|
|
119
117
|
}
|
|
120
|
-
const thumbnailBuffer = await
|
|
121
|
-
|
|
122
|
-
|
|
118
|
+
const thumbnailBuffer = await createWebpThumbnail(buffer, {
|
|
119
|
+
width: THUMBNAIL_SIZE,
|
|
120
|
+
height: THUMBNAIL_SIZE,
|
|
121
|
+
});
|
|
123
122
|
const thumbnailKey = `${THUMBNAIL_BOOK_IMAGE_PATH}/${fileName}`;
|
|
124
|
-
await minioClient.putObject(bucketName, thumbnailKey, thumbnailBuffer);
|
|
123
|
+
await minioClient.putObject(bucketName, thumbnailKey, Buffer.from(thumbnailBuffer));
|
|
125
124
|
return fileName;
|
|
126
125
|
}
|
|
127
126
|
async function ingestBooks() {
|
package/dist/ingest-books.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest-books.js","sourceRoot":"","sources":["../src/ingest-books.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ingest-books.js","sourceRoot":"","sources":["../src/ingest-books.ts"],"names":[],"mappings":"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"}
|
package/dist/ingest-images.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { makeExportedStatus, makeId, makeUserId, } from "@s-hirano-ist/s-core/shared-kernel/entities/common-entity";
|
|
3
|
+
import { createWebpThumbnail, readImageMetadata, } from "@s-hirano-ist/s-image-processing/node";
|
|
3
4
|
import { createPushoverService } from "@s-hirano-ist/s-notification";
|
|
4
5
|
import { createMinioClient } from "@s-hirano-ist/s-storage";
|
|
5
6
|
import { glob } from "glob";
|
|
6
7
|
import { readFile, stat } from "node:fs/promises";
|
|
7
8
|
import { basename, extname } from "node:path";
|
|
8
|
-
import sharp from "sharp";
|
|
9
9
|
const SCRIPT_NAME = "ingest-images";
|
|
10
10
|
const ORIGINAL_IMAGE_PATH = "images/original";
|
|
11
11
|
const THUMBNAIL_IMAGE_PATH = "images/thumbnail";
|
|
@@ -18,8 +18,6 @@ function getContentType(filePath) {
|
|
|
18
18
|
return "image/jpeg";
|
|
19
19
|
case ".png":
|
|
20
20
|
return "image/png";
|
|
21
|
-
case ".gif":
|
|
22
|
-
return "image/gif";
|
|
23
21
|
case ".webp":
|
|
24
22
|
return "image/webp";
|
|
25
23
|
default:
|
|
@@ -80,7 +78,7 @@ async function main() {
|
|
|
80
78
|
}
|
|
81
79
|
const buffer = await readFile(filePath);
|
|
82
80
|
const fileStat = await stat(filePath);
|
|
83
|
-
const metadata = await
|
|
81
|
+
const metadata = await readImageMetadata(buffer);
|
|
84
82
|
const contentType = getContentType(filePath);
|
|
85
83
|
if (!contentType) {
|
|
86
84
|
console.log(`⏭️ スキップ（未対応形式）: ${imagePath}`);
|
|
@@ -103,11 +101,12 @@ async function main() {
|
|
|
103
101
|
console.log(`📤 MinIO アップロード（original）: ${imagePath}`);
|
|
104
102
|
}
|
|
105
103
|
// Generate and upload thumbnail
|
|
106
|
-
const thumbnailBuffer = await
|
|
107
|
-
|
|
108
|
-
|
|
104
|
+
const thumbnailBuffer = await createWebpThumbnail(buffer, {
|
|
105
|
+
width: THUMBNAIL_SIZE,
|
|
106
|
+
height: THUMBNAIL_SIZE,
|
|
107
|
+
});
|
|
109
108
|
const thumbnailKey = `${THUMBNAIL_IMAGE_PATH}/${imagePath}`;
|
|
110
|
-
await minioClient.putObject(bucketName, thumbnailKey, thumbnailBuffer);
|
|
109
|
+
await minioClient.putObject(bucketName, thumbnailKey, Buffer.from(thumbnailBuffer));
|
|
111
110
|
console.log(`📤 MinIO アップロード（thumbnail）: ${imagePath}`);
|
|
112
111
|
// Create DB record
|
|
113
112
|
await prisma.image.create({
|
|
@@ -116,10 +115,8 @@ async function main() {
|
|
|
116
115
|
path: imagePath,
|
|
117
116
|
contentType,
|
|
118
117
|
fileSize: fileStat.size,
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
// oxlint-disable-next-line typescript/no-unnecessary-condition -- sharp's Metadata types width/height as non-nullable but they can be undefined at runtime for some inputs
|
|
122
|
-
height: metadata.height ?? null,
|
|
118
|
+
width: metadata.width,
|
|
119
|
+
height: metadata.height,
|
|
123
120
|
status: exported.status,
|
|
124
121
|
exportedAt: exported.exportedAt,
|
|
125
122
|
userId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest-images.js","sourceRoot":"","sources":["../src/ingest-images.ts"],"names":[],"mappings":";AACA,OAAO,EACN,kBAAkB,EAClB,MAAM,EACN,UAAU,GAEV,MAAM,2DAA2D,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"ingest-images.js","sourceRoot":"","sources":["../src/ingest-images.ts"],"names":[],"mappings":"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"}
|
package/dist/ingest-notes.js
CHANGED
|
@@ -1,31 +1,18 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { makeExportedStatus, makeId, makeUserId, } from "@s-hirano-ist/s-core/shared-kernel/entities/common-entity";
|
|
3
3
|
import { createPushoverService } from "@s-hirano-ist/s-notification";
|
|
4
|
+
import { parseMarkdownFrontmatter } from "@s-hirano-ist/s-search/frontmatter";
|
|
4
5
|
import { glob } from "glob";
|
|
5
6
|
import { readFile } from "node:fs/promises";
|
|
6
7
|
import { basename } from "node:path";
|
|
7
8
|
const SCRIPT_NAME = "ingest-notes";
|
|
8
9
|
function parseFrontmatter(content) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
}
|
|
16
|
-
const frontmatter = content.slice(3, endIndex).trim();
|
|
17
|
-
const body = content.slice(endIndex + 3).trim();
|
|
18
|
-
let heading;
|
|
19
|
-
let draft = false;
|
|
20
|
-
for (const line of frontmatter.split("\n")) {
|
|
21
|
-
const [key, ...rest] = line.split(":");
|
|
22
|
-
const value = rest.join(":").trim();
|
|
23
|
-
if (key.trim() === "heading")
|
|
24
|
-
heading = value;
|
|
25
|
-
if (key.trim() === "draft" && value === "true")
|
|
26
|
-
draft = true;
|
|
27
|
-
}
|
|
28
|
-
return { heading, draft, body };
|
|
10
|
+
const parsed = parseMarkdownFrontmatter(content);
|
|
11
|
+
return {
|
|
12
|
+
body: parsed.content.trim(),
|
|
13
|
+
draft: typeof parsed.data.draft === "boolean" ? parsed.data.draft : undefined,
|
|
14
|
+
heading: typeof parsed.data.heading === "string" ? parsed.data.heading : undefined,
|
|
15
|
+
};
|
|
29
16
|
}
|
|
30
17
|
function parseNoteFile(filePath, content) {
|
|
31
18
|
const { heading, draft, body } = parseFrontmatter(content);
|
package/dist/ingest-notes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest-notes.js","sourceRoot":"","sources":["../src/ingest-notes.ts"],"names":[],"mappings":";AACA,OAAO,EACN,kBAAkB,EAClB,MAAM,EACN,UAAU,GAEV,MAAM,2DAA2D,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,MAAM,WAAW,GAAG,cAAc,CAAC;AAEnC,SAAS,gBAAgB,CAAC,OAAe;IAKxC,
|
|
1
|
+
{"version":3,"file":"ingest-notes.js","sourceRoot":"","sources":["../src/ingest-notes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export type ContentFormatResult = {
|
|
2
|
+
code: number | null;
|
|
3
|
+
signal: NodeJS.Signals | null;
|
|
4
|
+
};
|
|
5
|
+
export declare function buildOxfmtArgs(rawArgs: readonly string[]): string[];
|
|
6
|
+
export declare function runContentFormat(rawArgs: readonly string[], cwd?: string): Promise<ContentFormatResult>;
|
|
7
|
+
//# sourceMappingURL=s-content-format-runner.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"s-content-format-runner.d.ts","sourceRoot":"","sources":["../src/s-content-format-runner.ts"],"names":[],"mappings":"AAkCA,MAAM,MAAM,mBAAmB,GAAG;IACjC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;CAC9B,CAAC;AAqCF,wBAAgB,cAAc,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAqBnE;AAED,wBAAgB,gBAAgB,CAC/B,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,GAAG,SAAgB,GACjB,OAAO,CAAC,mBAAmB,CAAC,CAW9B"}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
2
|
+
import { readFileSync } from "node:fs";
|
|
3
|
+
import { createRequire } from "node:module";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
const require = createRequire(import.meta.url);
|
|
6
|
+
const CONTENT_EXTENSIONS = [
|
|
7
|
+
".md",
|
|
8
|
+
".markdown",
|
|
9
|
+
".json",
|
|
10
|
+
".jsonc",
|
|
11
|
+
".json5",
|
|
12
|
+
".yml",
|
|
13
|
+
".yaml",
|
|
14
|
+
];
|
|
15
|
+
const DEFAULT_EXCLUDES = [
|
|
16
|
+
"!**/node_modules",
|
|
17
|
+
"!**/dist",
|
|
18
|
+
"!**/build",
|
|
19
|
+
"!**/coverage",
|
|
20
|
+
"!**/raw/article/**",
|
|
21
|
+
"!**/bun.lock",
|
|
22
|
+
"!**/package-lock.json",
|
|
23
|
+
"!**/yarn.lock",
|
|
24
|
+
"!**/.env",
|
|
25
|
+
"!**/.env.*",
|
|
26
|
+
];
|
|
27
|
+
function resolveOxfmtBin() {
|
|
28
|
+
const packageJsonPath = require.resolve("oxfmt/package.json");
|
|
29
|
+
const manifest = JSON.parse(readFileSync(packageJsonPath, "utf8"));
|
|
30
|
+
const bin = typeof manifest.bin === "string" ? manifest.bin : manifest.bin?.oxfmt;
|
|
31
|
+
if (bin === undefined) {
|
|
32
|
+
throw new Error("The installed oxfmt package does not expose an oxfmt bin");
|
|
33
|
+
}
|
|
34
|
+
return path.resolve(path.dirname(packageJsonPath), bin);
|
|
35
|
+
}
|
|
36
|
+
function isContentFile(target) {
|
|
37
|
+
const lowerTarget = target.toLowerCase();
|
|
38
|
+
return CONTENT_EXTENSIONS.some((extension) => lowerTarget.endsWith(extension));
|
|
39
|
+
}
|
|
40
|
+
function toContentTargets(target) {
|
|
41
|
+
if (isContentFile(target)) {
|
|
42
|
+
return [target];
|
|
43
|
+
}
|
|
44
|
+
let normalizedTarget = target.replaceAll("\\", "/");
|
|
45
|
+
while (normalizedTarget.endsWith("/")) {
|
|
46
|
+
normalizedTarget = normalizedTarget.slice(0, -1);
|
|
47
|
+
}
|
|
48
|
+
const base = normalizedTarget === "" ? "." : normalizedTarget;
|
|
49
|
+
return CONTENT_EXTENSIONS.map((extension) => `${base}/**/*${extension}`);
|
|
50
|
+
}
|
|
51
|
+
export function buildOxfmtArgs(rawArgs) {
|
|
52
|
+
const isCheck = rawArgs.includes("--check");
|
|
53
|
+
const remaining = rawArgs.filter((arg) => arg !== "--check");
|
|
54
|
+
const options = remaining.filter((arg) => arg.startsWith("-"));
|
|
55
|
+
const paths = remaining.filter((arg) => !arg.startsWith("-"));
|
|
56
|
+
const contentTargets = (paths.length === 0 ? ["."] : paths).flatMap((target) => toContentTargets(target));
|
|
57
|
+
const packageRoot = path.resolve(import.meta.dirname, "..");
|
|
58
|
+
const configPath = path.join(packageRoot, "configs", "oxfmt.json");
|
|
59
|
+
return [
|
|
60
|
+
isCheck ? "--check" : "--write",
|
|
61
|
+
"--config",
|
|
62
|
+
configPath,
|
|
63
|
+
"--disable-nested-config",
|
|
64
|
+
"--no-error-on-unmatched-pattern",
|
|
65
|
+
...options,
|
|
66
|
+
...contentTargets,
|
|
67
|
+
...DEFAULT_EXCLUDES,
|
|
68
|
+
];
|
|
69
|
+
}
|
|
70
|
+
export function runContentFormat(rawArgs, cwd = process.cwd()) {
|
|
71
|
+
const child = spawn(process.execPath, [resolveOxfmtBin(), ...buildOxfmtArgs(rawArgs)], { cwd, stdio: "inherit" });
|
|
72
|
+
return new Promise((resolve, reject) => {
|
|
73
|
+
child.once("error", reject);
|
|
74
|
+
child.once("exit", (code, signal) => resolve({ code, signal }));
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
//# sourceMappingURL=s-content-format-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"s-content-format-runner.js","sourceRoot":"","sources":["../src/s-content-format-runner.ts"],"names":[],"mappings":"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"}
|
package/dist/s-content-format.js
CHANGED
|
@@ -1,45 +1,18 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const DEFAULT_EXCLUDES = [
|
|
12
|
-
"!**/node_modules",
|
|
13
|
-
"!**/dist",
|
|
14
|
-
"!**/build",
|
|
15
|
-
"!**/coverage",
|
|
16
|
-
"!**/raw/article/**",
|
|
17
|
-
"!**/bun.lock",
|
|
18
|
-
"!**/package-lock.json",
|
|
19
|
-
"!**/yarn.lock",
|
|
20
|
-
"!**/.env",
|
|
21
|
-
"!**/.env.*",
|
|
22
|
-
];
|
|
23
|
-
const rawArgs = process.argv.slice(2);
|
|
24
|
-
const checkFlagIndex = rawArgs.indexOf("--check");
|
|
25
|
-
const isCheck = checkFlagIndex !== -1;
|
|
26
|
-
const remaining = checkFlagIndex === -1
|
|
27
|
-
? rawArgs
|
|
28
|
-
: [
|
|
29
|
-
...rawArgs.slice(0, checkFlagIndex),
|
|
30
|
-
...rawArgs.slice(checkFlagIndex + 1),
|
|
31
|
-
];
|
|
32
|
-
const subcommand = isCheck ? "check" : "fmt";
|
|
33
|
-
const hasPositional = remaining.some((arg) => !arg.startsWith("-"));
|
|
34
|
-
const finalArgs = hasPositional
|
|
35
|
-
? remaining
|
|
36
|
-
: [...remaining, ".", ...DEFAULT_EXCLUDES];
|
|
37
|
-
const child = spawn(process.execPath, [dprintBin, subcommand, "--config", configPath, ...finalArgs], { stdio: "inherit" });
|
|
38
|
-
child.on("exit", (code, signal) => {
|
|
39
|
-
if (signal) {
|
|
40
|
-
process.kill(process.pid, signal);
|
|
41
|
-
return;
|
|
2
|
+
import { runContentFormat } from "./s-content-format-runner.js";
|
|
3
|
+
async function main() {
|
|
4
|
+
try {
|
|
5
|
+
const { code, signal } = await runContentFormat(process.argv.slice(2));
|
|
6
|
+
if (signal !== null) {
|
|
7
|
+
process.kill(process.pid, signal);
|
|
8
|
+
return;
|
|
9
|
+
}
|
|
10
|
+
process.exitCode = code ?? 1;
|
|
42
11
|
}
|
|
43
|
-
|
|
44
|
-
|
|
12
|
+
catch (error) {
|
|
13
|
+
console.error(error);
|
|
14
|
+
process.exitCode = 1;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
void main();
|
|
45
18
|
//# sourceMappingURL=s-content-format.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"s-content-format.js","sourceRoot":"","sources":["../src/s-content-format.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"s-content-format.js","sourceRoot":"","sources":["../src/s-content-format.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,KAAK,UAAU,IAAI;IAClB,IAAI,CAAC;QACJ,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAClC,OAAO;QACR,CAAC;QACD,OAAO,CAAC,QAAQ,GAAG,IAAI,IAAI,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACtB,CAAC;AACF,CAAC;AAED,KAAK,IAAI,EAAE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"s-content-format.test.d.ts","sourceRoot":"","sources":["../src/s-content-format.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
|
|
2
|
+
import { tmpdir } from "node:os";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { afterEach, describe, expect, test } from "vitest";
|
|
5
|
+
import { buildOxfmtArgs, runContentFormat } from "./s-content-format-runner.js";
|
|
6
|
+
const temporaryDirectories = [];
|
|
7
|
+
async function createTemporaryDirectory() {
|
|
8
|
+
const directory = await mkdtemp(path.join(tmpdir(), "s-content-format-"));
|
|
9
|
+
temporaryDirectories.push(directory);
|
|
10
|
+
return directory;
|
|
11
|
+
}
|
|
12
|
+
afterEach(async () => {
|
|
13
|
+
await Promise.all(temporaryDirectories
|
|
14
|
+
.splice(0)
|
|
15
|
+
.map((directory) => rm(directory, { force: true, recursive: true })));
|
|
16
|
+
});
|
|
17
|
+
describe("buildOxfmtArgs", () => {
|
|
18
|
+
test("limits the default targets to content file extensions", () => {
|
|
19
|
+
const args = buildOxfmtArgs([]);
|
|
20
|
+
expect(args).toContain("--write");
|
|
21
|
+
expect(args).toContain("--disable-nested-config");
|
|
22
|
+
expect(args).toContain("./**/*.md");
|
|
23
|
+
expect(args).toContain("./**/*.json");
|
|
24
|
+
expect(args).toContain("./**/*.yaml");
|
|
25
|
+
expect(args).not.toContain(".");
|
|
26
|
+
});
|
|
27
|
+
test("preserves a content file and expands a directory", () => {
|
|
28
|
+
const args = buildOxfmtArgs(["--check", "content/book.json", "notes"]);
|
|
29
|
+
expect(args).toContain("--check");
|
|
30
|
+
expect(args).toContain("content/book.json");
|
|
31
|
+
expect(args).toContain("notes/**/*.md");
|
|
32
|
+
expect(args).toContain("notes/**/*.yml");
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
describe("runContentFormat", () => {
|
|
36
|
+
test("formats Markdown, JSON, and YAML without changing source files", async () => {
|
|
37
|
+
const directory = await createTemporaryDirectory();
|
|
38
|
+
const markdownPath = path.join(directory, "content.md");
|
|
39
|
+
const jsonPath = path.join(directory, "content.json");
|
|
40
|
+
const yamlPath = path.join(directory, "content.yaml");
|
|
41
|
+
const typescriptPath = path.join(directory, "source.ts");
|
|
42
|
+
await Promise.all([
|
|
43
|
+
writeFile(markdownPath, "# Title\n\n- item\n"),
|
|
44
|
+
writeFile(jsonPath, '{"name":"example","enabled":true}\n'),
|
|
45
|
+
writeFile(yamlPath, "name: example\nitems:\n - one\n"),
|
|
46
|
+
writeFile(typescriptPath, "const value=1\n"),
|
|
47
|
+
]);
|
|
48
|
+
const result = await runContentFormat([], directory);
|
|
49
|
+
expect(result).toEqual({ code: 0, signal: null });
|
|
50
|
+
expect(await readFile(markdownPath, "utf8")).not.toContain("- item");
|
|
51
|
+
expect(await readFile(jsonPath, "utf8")).not.toContain('"name":"example"');
|
|
52
|
+
expect(await readFile(yamlPath, "utf8")).not.toContain("\n - one");
|
|
53
|
+
expect(await readFile(typescriptPath, "utf8")).toBe("const value=1\n");
|
|
54
|
+
});
|
|
55
|
+
test("check mode reports unformatted files without writing them", async () => {
|
|
56
|
+
const directory = await createTemporaryDirectory();
|
|
57
|
+
const jsonPath = path.join(directory, "content.json");
|
|
58
|
+
const original = '{"name":"example","enabled":true}\n';
|
|
59
|
+
await writeFile(jsonPath, original);
|
|
60
|
+
const unformattedResult = await runContentFormat(["--check"], directory);
|
|
61
|
+
expect(unformattedResult.code).not.toBe(0);
|
|
62
|
+
expect(await readFile(jsonPath, "utf8")).toBe(original);
|
|
63
|
+
expect((await runContentFormat([], directory)).code).toBe(0);
|
|
64
|
+
expect((await runContentFormat(["--check"], directory)).code).toBe(0);
|
|
65
|
+
});
|
|
66
|
+
test("keeps default exclusions and explicit directory boundaries", async () => {
|
|
67
|
+
const directory = await createTemporaryDirectory();
|
|
68
|
+
const selectedDirectory = path.join(directory, "selected");
|
|
69
|
+
const otherDirectory = path.join(directory, "other");
|
|
70
|
+
const rawDirectory = path.join(selectedDirectory, "raw", "article");
|
|
71
|
+
await Promise.all([
|
|
72
|
+
mkdir(selectedDirectory, { recursive: true }),
|
|
73
|
+
mkdir(otherDirectory, { recursive: true }),
|
|
74
|
+
mkdir(rawDirectory, { recursive: true }),
|
|
75
|
+
]);
|
|
76
|
+
const selectedPath = path.join(selectedDirectory, "selected.json");
|
|
77
|
+
const otherPath = path.join(otherDirectory, "other.json");
|
|
78
|
+
const rawPath = path.join(rawDirectory, "raw.md");
|
|
79
|
+
const unformattedJson = '{"name":"example"}\n';
|
|
80
|
+
const unformattedMarkdown = "# Raw\n\n- item\n";
|
|
81
|
+
await Promise.all([
|
|
82
|
+
writeFile(selectedPath, unformattedJson),
|
|
83
|
+
writeFile(otherPath, unformattedJson),
|
|
84
|
+
writeFile(rawPath, unformattedMarkdown),
|
|
85
|
+
]);
|
|
86
|
+
const result = await runContentFormat(["selected"], directory);
|
|
87
|
+
expect(result.code).toBe(0);
|
|
88
|
+
expect(await readFile(selectedPath, "utf8")).not.toBe(unformattedJson);
|
|
89
|
+
expect(await readFile(otherPath, "utf8")).toBe(unformattedJson);
|
|
90
|
+
expect(await readFile(rawPath, "utf8")).toBe(unformattedMarkdown);
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
//# sourceMappingURL=s-content-format.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"s-content-format.test.js","sourceRoot":"","sources":["../src/s-content-format.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@s-hirano-ist/s-scripts",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.26.0",
|
|
4
4
|
"description": "CLI scripts for s-private data operations",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -49,26 +49,24 @@
|
|
|
49
49
|
"access": "public"
|
|
50
50
|
},
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@googleapis/books": "
|
|
52
|
+
"@googleapis/books": "9.0.0",
|
|
53
53
|
"cheerio": "1.2.0",
|
|
54
|
-
"dprint": "0.54.0",
|
|
55
54
|
"glob": "13.0.6",
|
|
56
|
-
"
|
|
57
|
-
"
|
|
58
|
-
"
|
|
59
|
-
"sharp": "0.35.1",
|
|
55
|
+
"iconv-lite": "0.7.3",
|
|
56
|
+
"js-yaml": "5.3.0",
|
|
57
|
+
"oxfmt": "0.63.0",
|
|
60
58
|
"turndown": "7.2.4",
|
|
61
|
-
"@s-hirano-ist/s-database": "1.21.0",
|
|
62
59
|
"@s-hirano-ist/s-core": "1.21.2",
|
|
63
|
-
"@s-hirano-ist/s-
|
|
60
|
+
"@s-hirano-ist/s-database": "1.21.0",
|
|
64
61
|
"@s-hirano-ist/s-notification": "1.18.5",
|
|
62
|
+
"@s-hirano-ist/s-image-processing": "1.0.0",
|
|
63
|
+
"@s-hirano-ist/s-search": "1.18.13",
|
|
65
64
|
"@s-hirano-ist/s-storage": "1.18.9"
|
|
66
65
|
},
|
|
67
66
|
"devDependencies": {
|
|
68
|
-
"@types/
|
|
69
|
-
"@types/node": "24.13.2",
|
|
67
|
+
"@types/node": "24.13.3",
|
|
70
68
|
"@types/turndown": "5.0.6",
|
|
71
|
-
"tsx": "4.
|
|
69
|
+
"tsx": "4.23.12",
|
|
72
70
|
"typescript": "6.0.3"
|
|
73
71
|
},
|
|
74
72
|
"scripts": {
|
package/configs/dprint.json
DELETED
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"$schema": "https://dprint.dev/schemas/v0.json",
|
|
3
|
-
"lineWidth": 80,
|
|
4
|
-
"indentWidth": 2,
|
|
5
|
-
"useTabs": false,
|
|
6
|
-
"markdown": {
|
|
7
|
-
"lineWidth": 80,
|
|
8
|
-
"textWrap": "maintain"
|
|
9
|
-
},
|
|
10
|
-
"json": {
|
|
11
|
-
"indentWidth": 2
|
|
12
|
-
},
|
|
13
|
-
"yaml": {
|
|
14
|
-
"indentWidth": 2,
|
|
15
|
-
"quotes": "preferDouble"
|
|
16
|
-
},
|
|
17
|
-
"plugins": [
|
|
18
|
-
"https://plugins.dprint.dev/markdown-0.21.1.wasm",
|
|
19
|
-
"https://plugins.dprint.dev/json-0.21.3.wasm",
|
|
20
|
-
"https://plugins.dprint.dev/g-plane/pretty_yaml-v0.6.0.wasm"
|
|
21
|
-
]
|
|
22
|
-
}
|