my-gadgetry 1.0.11 → 1.1.2

package/dist/_core/fs.d.ts

@@ -0,0 +1,9 @@
+export interface Options {
+    include: string[];
+    exclude: string[];
+}
+export declare const OPTIONS: {
+    include: never[];
+    exclude: never[];
+};
+export declare const getAllFiles: (dir: string, _files?: string[], { include, exclude }?: Options) => string[];

package/dist/_core/fs.js

@@ -0,0 +1,28 @@
+import { statSync, readdirSync } from 'fs';
+import { minimatch } from 'minimatch';
+export const OPTIONS = {
+    include: [],
+    exclude: [],
+};
+const isMatch = (path, patterns) => {
+    return patterns.some(pattern => minimatch(path, pattern));
+};
+export const getAllFiles = (dir, _files = [], { include, exclude } = OPTIONS) => {
+    const files = readdirSync(dir);
+    for (const file of files) {
+        const name = dir + '/' + file;
+        if (isMatch(name, exclude)) {
+            continue;
+        }
+        if (statSync(name).isDirectory()) {
+            getAllFiles(name, _files, { include, exclude });
+        }
+        else {
+            if (include.length > 0 && !isMatch(name, include)) {
+                continue;
+            }
+            _files.push(name);
+        }
+    }
+    return _files;
+};

package/dist/_internal/dev-ops/package-generator/generate-alias/get-aliases.js

@@ -1,8 +1,8 @@
-import { getFiles } from './get-files.js';
+import { getAllFiles } from '../../../../_core/fs.js';
 export const getAliases = (path, excludes) => {
     const regExp = new RegExp(`^${path}/`);
     const excludesExp = new RegExp(excludes.join('|'));
-    const aliases = getFiles(path).map(path => path.replace(regExp, '').replace(/\.ts$/, ''));
+    const aliases = getAllFiles(path).map(path => path.replace(regExp, '').replace(/\.ts$/, ''));
     if (excludes.length) {
         return aliases.filter(path => !excludesExp.test(path));
     }

package/dist/_internal/fs.d.ts

@@ -0,0 +1 @@
+export * from '../_core/fs.js';

package/dist/_internal/fs.js

@@ -0,0 +1 @@
+export * from '../_core/fs.js';

package/dist/modules/fs.d.ts

@@ -0,0 +1 @@
+export * from '../_internal/fs.js';

package/dist/modules/fs.js

@@ -0,0 +1 @@
+export * from '../_internal/fs.js';

package/fs/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "@cilly/my-gadgetry-modules-fs",
+  "types": "../dist/modules/fs.d.ts",
+  "main": "../dist/modules/fs.js",
+  "sideEffects": false
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "my-gadgetry",
   "type": "module",
-  "version": "1.0.11",
+  "version": "1.1.2",
   "description": "",
   "author": "",
   "repository": {
@@ -29,20 +29,17 @@
     "tsc": "tsc -p tsconfig.publish.json && tsc-alias -p tsconfig.publish.json",
     "generate": "tsx --tsconfig ./tsconfig.zx.json ./tools/generate-alias.zx.ts",
     "ci:update-version": "tsx --tsconfig ./tsconfig.zx.json ./tools/update-version.zx.ts",
-
     "//--- test ---//": "",
     "test": "run-s test:*",
     "test:lint": "npm run lint",
     "test:prettier": "npm run prettier:check",
     "test:jest": "npm run jest",
-
     "//--- build ---//": "",
     "build": "run-s build:*",
     "build:test": "npm run test",
     "build:clean": "npm run clean",
     "build:tsc": "npm run tsc",
     "build:generate": "npm run generate",
-
     "//--- publish ---//": "",
     "publish:build": "run-s build:{clean,tsc,generate}"
   },
@@ -51,6 +48,7 @@
     "@actions/exec": "^1.1.1",
     "@actions/github": "^6.0.0",
     "fs-extra": "^11.2.0",
+    "minimatch": "^9.0.4",
     "zx": "^8.1.0"
   },
   "devDependencies": {
@@ -72,12 +70,12 @@
     "husky": "^9.0.11",
     "jest": "^29.7.0",
     "lint-staged": "^15.2.2",
-    "npm-run-all2": "^6.1.2",
+    "npm-run-all2": "^6.2.0",
     "prettier": "^3.2.5",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.10",
-    "tsx": "^4.10.2",
+    "tsx": "^4.10.4",
     "typescript": "^5.4.5",
     "typescript-eslint": "^7.9.0"
   },
@@ -88,6 +86,7 @@
     "./converters/number": "./dist/modules/converters/number.js",
     "./converters/string": "./dist/modules/converters/string.js",
     "./dev-ops/package-generator/generate-alias": "./dist/modules/dev-ops/package-generator/generate-alias.js",
+    "./fs": "./dist/modules/fs.js",
     "./type-check": "./dist/modules/type-check.js",
     "./package.json": "./package.json"
   },
@@ -97,6 +96,7 @@
     "color",
     "converters",
     "dev-ops",
+    "fs",
     "type-check",
     "src",
     "package.json",

package/src/_core/__tests__/fs.spec.ts

@@ -0,0 +1,73 @@
+import { resolve, join } from 'path'
+import { getAllFiles } from '../fs.js'
+
+describe('getAllFiles', () => {
+  const path = resolve(__dirname, '../../..', 'fs-test')
+  it('no exclude & include', () => {
+    const exclude: string[] = []
+    const include: string[] = []
+    const expects = [
+      join(path, 'foo/piyo/index.ts'),
+      join(path, 'foo/piyo.ts'),
+      join(path, 'foo.ts'),
+      join(path, 'hoge/foo/piyo/index.ts'),
+      join(path, 'hoge/foo/piyo.ts'),
+      join(path, 'hoge/foo.ts'),
+      join(path, 'hoge.ts'),
+    ]
+    expect(JSON.stringify(getAllFiles(path, [], { include, exclude }))).toBe(JSON.stringify(expects))
+  })
+  describe('set exclude', () => {
+    it('filename', () => {
+      const exclude: string[] = ['**/index.ts']
+      const include: string[] = []
+      const expects = [
+        join(path, 'foo/piyo.ts'),
+        join(path, 'foo.ts'),
+        join(path, 'hoge/foo/piyo.ts'),
+        join(path, 'hoge/foo.ts'),
+        join(path, 'hoge.ts'),
+      ]
+      expect(JSON.stringify(getAllFiles(path, [], { include, exclude }))).toBe(JSON.stringify(expects))
+    })
+    it('dirname', () => {
+      const exclude: string[] = ['**/piyo/**/*']
+      const include: string[] = []
+      const expects = [
+        join(path, 'foo/piyo.ts'),
+        join(path, 'foo.ts'),
+        join(path, 'hoge/foo/piyo.ts'),
+        join(path, 'hoge/foo.ts'),
+        join(path, 'hoge.ts'),
+      ]
+      expect(JSON.stringify(getAllFiles(path, [], { include, exclude }))).toBe(JSON.stringify(expects))
+    })
+  })
+  describe('set include', () => {
+    it('filename', () => {
+      const exclude: string[] = []
+      const include: string[] = ['**/index.ts']
+      const expects = [join(path, 'foo/piyo/index.ts'), join(path, 'hoge/foo/piyo/index.ts')]
+      expect(JSON.stringify(getAllFiles(path, [], { include, exclude }))).toBe(JSON.stringify(expects))
+    })
+    it('dirname', () => {
+      const exclude: string[] = []
+      const include: string[] = ['**/foo/**/*']
+      const expects = [
+        join(path, 'foo/piyo/index.ts'),
+        join(path, 'foo/piyo.ts'),
+        join(path, 'hoge/foo/piyo/index.ts'),
+        join(path, 'hoge/foo/piyo.ts'),
+      ]
+      expect(JSON.stringify(getAllFiles(path, [], { include, exclude }))).toBe(JSON.stringify(expects))
+    })
+  })
+  describe('set include & exclude', () => {
+    it('filename & dirname', () => {
+      const exclude: string[] = ['**/p*.ts']
+      const include: string[] = ['**/foo/**/*']
+      const expects = [join(path, 'foo/piyo/index.ts'), join(path, 'hoge/foo/piyo/index.ts')]
+      expect(JSON.stringify(getAllFiles(path, [], { include, exclude }))).toBe(JSON.stringify(expects))
+    })
+  })
+})

package/src/_core/fs.ts

@@ -0,0 +1,36 @@
+import { statSync, readdirSync } from 'fs'
+
+import { minimatch } from 'minimatch'
+
+export interface Options {
+  include: string[]
+  exclude: string[]
+}
+
+export const OPTIONS = {
+  include: [],
+  exclude: [],
+}
+
+const isMatch = (path: string, patterns: string[]) => {
+  return patterns.some(pattern => minimatch(path, pattern))
+}
+
+export const getAllFiles = (dir: string, _files: string[] = [], { include, exclude }: Options = OPTIONS) => {
+  const files = readdirSync(dir)
+  for (const file of files) {
+    const name = dir + '/' + file
+    if (isMatch(name, exclude)) {
+      continue
+    }
+    if (statSync(name).isDirectory()) {
+      getAllFiles(name, _files, { include, exclude })
+    } else {
+      if (include.length > 0 && !isMatch(name, include)) {
+        continue
+      }
+      _files.push(name)
+    }
+  }
+  return _files
+}

package/src/_internal/dev-ops/package-generator/generate-alias/get-aliases.ts

@@ -1,9 +1,9 @@
-import { getFiles } from './get-files.js'
+import { getAllFiles } from '~core/fs.js'
 
 export const getAliases = (path: string, excludes: string[]) => {
   const regExp = new RegExp(`^${path}/`)
   const excludesExp = new RegExp(excludes.join('|'))
-  const aliases = getFiles(path).map(path => path.replace(regExp, '').replace(/\.ts$/, ''))
+  const aliases = getAllFiles(path).map(path => path.replace(regExp, '').replace(/\.ts$/, ''))
   if (excludes.length) {
     return aliases.filter(path => !excludesExp.test(path))
   }

package/src/_internal/fs.ts

@@ -0,0 +1 @@
+export * from '~core/fs.js'

package/src/modules/fs.ts

@@ -0,0 +1 @@
+export * from '~internal/fs.js'

package/dist/_internal/dev-ops/package-generator/generate-alias/get-files.d.ts

@@ -1 +0,0 @@
-export declare const getFiles: (dir: string, _files?: string[]) => string[];

package/dist/_internal/dev-ops/package-generator/generate-alias/get-files.js

@@ -1,14 +0,0 @@
-import { statSync, readdirSync } from 'fs';
-export const getFiles = (dir, _files = []) => {
-    const files = readdirSync(dir);
-    for (const file of files) {
-        const name = dir + '/' + file;
-        if (statSync(name).isDirectory()) {
-            getFiles(name, _files);
-        }
-        else {
-            _files.push(name);
-        }
-    }
-    return _files;
-};

package/src/_internal/dev-ops/package-generator/generate-alias/get-files.ts

@@ -1,14 +0,0 @@
-import { statSync, readdirSync } from 'fs'
-
-export const getFiles = (dir: string, _files: string[] = []) => {
-  const files = readdirSync(dir)
-  for (const file of files) {
-    const name = dir + '/' + file
-    if (statSync(name).isDirectory()) {
-      getFiles(name, _files)
-    } else {
-      _files.push(name)
-    }
-  }
-  return _files
-}