@ainc/fs 0.1.9 → 0.1.13

package/src/isRelativePath.ts

@@ -7,11 +7,46 @@
 'use strict';
 
 
+/**
+ *****************************************
+ * 加载依赖
+ *****************************************
+ */
+import { sep } from 'path';
+
+
+/**
+ *****************************************
+ * 判断是否为路径分隔符
+ *****************************************
+ */
+function isSep(ch: string): boolean {
+
+    // 模块相对标识
+    if (ch === '/' || ch === '') {
+        return true;
+    }
+
+    // 路径相对标识
+    return ch === sep;
+}
+
+
 /**
  *****************************************
  * 判断是否为相对路径
  *****************************************
  */
 export function isRelativePath(source: string): boolean {
-    return source.startsWith('./') || source.startsWith('../');
+
+    // 非相对标识
+    if (source.charAt(0) !== '.') {
+        return false;
+    }
+
+    // 位1字符
+    const ch1 = source.charAt(1);
+
+    // 非相对路径
+    return ch1 === '.' ? isSep(source.charAt(2)) : isSep(ch1);
 }

package/src/json.ts

@@ -32,9 +32,9 @@ interface Data {
  * 读取/写入【json】文件
  *****************************************
  */
-function json<T extends Data>(path: string): T | null;
-function json<T extends Data>(path: string, data: T): T;
-function json<T extends Data>(...args: [string] | [string, T]): T | null {
+function json<T = Data>(path: string): T | null;
+function json<T = Data>(path: string, data: T): T;
+function json<T = Data>(...args: [string] | [string, T]): T | null {
     const [name, data] = args;
 
     // 读写数据

package/src/jsonc.ts

@@ -15,8 +15,7 @@
 import { stat } from './stat';
 import { readFile } from './readFile';
 import { writeFile } from './writeFile';
-import { stripBOM } from './stripBOM';
-import { stripComments } from './stripComments';
+import { normalizeJSON } from './normalizeJSON';
 
 
 /**
@@ -34,9 +33,9 @@ interface Data {
  * 读取/写入【jsonc】文件
  *****************************************
  */
-function jsonc<T extends Data>(path: string): T | null;
-function jsonc<T extends Data>(path: string, data: T): T;
-function jsonc<T extends Data>(...args: [string] | [string, T]): T | null {
+function jsonc<T = Data>(path: string): T | null;
+function jsonc<T = Data>(path: string, data: T): T;
+function jsonc<T = Data>(...args: [string] | [string, T]): T | null {
     const [name, data] = args;
 
     // 读写数据
@@ -46,7 +45,7 @@ function jsonc<T extends Data>(...args: [string] | [string, T]): T | null {
         const stats = stat(name);
 
         if (stats && stats.isFile()) {
-            const content = stripComments(stripBOM(readFile(stats.path)));
+            const content = normalizeJSON(readFile(stats.path));
 
             // 空白文件
             if (!content.trim()) {

package/src/normalizeJSON.ts

@@ -0,0 +1,167 @@
+/**
+ *****************************************
+ * Created by edonet@163.com
+ * Created on 2021-05-31 22:41:48
+ *****************************************
+ */
+'use strict';
+
+
+/**
+ *****************************************
+ * 判断是否为转义字符
+ *****************************************
+ */
+function isEscaped(index: number, source: string): number {
+    let count = 1;
+
+    // 统计转义字符
+    while (source[index - count] === '\\') {
+        count ++;
+    }
+
+    // 判断是否转义
+    return count % 2;
+}
+
+
+/**
+ *****************************************
+ * 判断是否为结尾的逗号
+ *****************************************
+ */
+function isTrailingComma(start: number, source: string): boolean {
+    let ch = source[start];
+
+    // 过滤空白字符
+    while (' \n\r'.indexOf(ch) > -1) {
+        ch = source[++ start];
+    }
+
+    // 返回是否为结束符
+    return '}]'.indexOf(ch) > -1;
+}
+
+
+/**
+ *****************************************
+ * 查找字符串结束
+ *****************************************
+ */
+function indexStringEnd(start: number, ch: string, source: string): number {
+    const idx = source.indexOf(ch, start);
+
+    // 判断是否查找结束
+    if (idx === -1) {
+        return source.length;
+    } else {
+        return isEscaped(idx, source) ? idx + 1 : indexStringEnd(idx + 1, ch, source);
+    }
+}
+
+
+/**
+ *****************************************
+ * 查找行注释结束
+ *****************************************
+ */
+function indexLineCommentEnd(start: number, source: string): number {
+    const idx = source.indexOf('\n', start);
+
+    // 判断是否查找结束
+    if (idx === -1) {
+        return source.length;
+    } else {
+        return source[idx - 1] === '\r' ? idx - 1 : idx;
+    }
+}
+
+
+/**
+ *****************************************
+ * 查找块注释结束
+ *****************************************
+ */
+function indexBlockCommentEnd(start: number, source: string): number {
+    const idx = source.indexOf('/', start);
+
+    if (idx === -1) {
+        return source.length;
+    } else if (source[idx - 1] === '*') {
+        return idx + 1;
+    } else {
+        return indexBlockCommentEnd(idx + 1, source);
+    }
+}
+
+
+/**
+ *****************************************
+ * 过滤注释
+ *****************************************
+ */
+export function normalizeJSON(content: string): string {
+    let result = '';
+    let idx = 0;
+    let len = content.length;
+    let start = 0;
+
+    // 检测第一个字符是否为BOM
+    if (content.charCodeAt(0) === 0xFEFF) {
+        idx = start = 1;
+    }
+
+    // 遍历字符
+    while (idx < len) {
+        const ch = content[idx];
+
+        // 跳过字符串
+        if (ch === '"' || ch === '\'') {
+            idx = indexStringEnd(idx + 1, ch, content);
+            continue;
+        }
+
+        // 自增偏移
+        idx ++;
+
+        // 判断是为结尾的逗号
+        if (ch === ',' && isTrailingComma(idx, content)) {
+            result += content.slice(start, idx - 1);
+            start = idx;
+            idx = start + 1;
+            continue;
+        }
+
+        // 非注释
+        if (ch !== '/') {
+            continue;
+        }
+
+        // 获取下一字符
+        const next = content[idx];
+
+        // 处理行注释
+        if (next === '/') {
+            result += content.slice(start, idx - 1);
+            start = indexLineCommentEnd(idx + 1, content);
+            idx = start + 1;
+            continue;
+        }
+
+        // 处理多行注释
+        if (next === '*') {
+            result += content.slice(start, idx - 1);
+            start = indexBlockCommentEnd(idx + 2, content);
+            idx = start;
+            continue;
+        }
+    }
+
+    // 添加结束片段
+    if (start < len) {
+        result += content.slice(start);
+    }
+
+    // 返回结果
+    return result;
+}

package/src/realpath.ts

@@ -0,0 +1,35 @@
+/**
+ *****************************************
+ * Created by edonet@163.com
+ * Created on 2021-07-17 17:42:34
+ *****************************************
+ */
+'use strict';
+
+
+/**
+ *****************************************
+ * 加载依赖
+ *****************************************
+ */
+import { realpathSync } from 'fs';
+import { resolve } from 'path';
+import { isAbsolutePath } from './isAbsolutePath';
+
+
+/**
+ *****************************************
+ * 获取基准路径
+ *****************************************
+ */
+export const baseDir = realpathSync(process.cwd());
+
+
+/**
+ *****************************************
+ * 解析真实地址
+ *****************************************
+ */
+export function realpath(path: string): string {
+    return isAbsolutePath(path) ? realpathSync(path) : resolve(baseDir, path);
+}

package/src/relative.ts

@@ -21,7 +21,12 @@ import * as path from 'path';
  *****************************************
  */
 export function relative(from: string, to: string): string {
-    const result = path.relative(from, to);
+    let result = path.relative(from, to);
+
+    // 替换分隔符
+    if (path.sep === '\\') {
+        result = result.split('\\').join('/');
+    }
 
     // 补全相对路径
     if (result.charAt(0) !== '.') {

package/src/resolve.ts

@@ -24,6 +24,7 @@ import { findFile } from './findFile';
  */
 export interface Options {
     ext?: string;
+    test?: RegExp;
     exclude?: string[];
 }
 
@@ -47,7 +48,7 @@ export interface Asset {
  */
 export function resolve(dir: string | string[], options: Options = {}): Asset[] {
     const input = Array.isArray(dir) ? dir : [dir];
-    const name = options.ext ? options.ext + '$' : '*';
+    const name = options.ext ? options.ext + '$' : options.test || '*';
     const ignore = options.exclude ? ['node_modules', ...options.exclude] : ['node_modules'];
     const assets: Asset[] = [];
 

package/src/resolvePath.ts

@@ -0,0 +1,234 @@
+/**
+ *****************************************
+ * Created by edonet@163.com
+ * Created on 2021-06-19 00:16:40
+ *****************************************
+ */
+'use strict';
+
+
+/**
+ *****************************************
+ * 加载依赖
+ *****************************************
+ */
+import { createFileResolver, FileResolver, Handler, Options as FileOptions } from './helpers/FileResolver';
+import { split } from './helpers/split';
+import { each } from './helpers/each';
+import { compose } from './helpers/compose';
+import { cwd } from './cwd';
+
+
+/**
+ *****************************************
+ * 格式化别名
+ *****************************************
+ */
+function normalizePaths(value: string | string[]): void | string[] {
+
+    // 校验值
+    if (!value) {
+        return;
+    }
+
+    // 处理字符串配置
+    if (typeof value === 'string') {
+        return [value];
+    }
+
+    // 校验数组配置参数
+    if (!Array.isArray(value) || !value.length) {
+        return;
+    }
+
+    // 校验参数
+    if (value.find(path => !path || typeof path !== 'string')) {
+        throw new Error('expect paths value to be valid string[]!');
+    }
+
+    // 返回结果
+    return value;
+}
+
+
+/**
+ *****************************************
+ * 创建路径解析器
+ *****************************************
+ */
+function createPathsResolver(resolver: FileResolver, options: Options): Handler {
+    const rules: Handler[] = [];
+    const baseURL = cwd(options.context || process.cwd(), options.baseUrl || './');
+    const resolvePath = resolver.resolvePath;
+
+    // 解析路径
+    function resolvePaths(paths: string[]): Handler {
+        return compose(paths.map(value => {
+            const [start, end] = split(value, '*');
+
+            // 处理绝对匹配
+            if (end === undefined) {
+                return (_, context) => resolvePath(cwd(baseURL, start), context);
+            } else {
+                return (id, context) => resolvePath(cwd(baseURL, start + id + end), context);
+            }
+        }));
+    }
+
+    // 校验存在路径映射配置
+    each(options.paths, (value, key) => {
+        const paths = normalizePaths(value);
+
+        // 校验配置
+        if (!paths) {
+            return;
+        }
+
+        // 生成解析函数
+        const resolve = resolvePaths(paths);
+
+        // 解析匹配项
+        const [start, end] = split(key, '*');
+
+        // 完成匹配
+        if (end === undefined) {
+            return rules.push((id, context) => {
+                return id === start ? resolve('', context) : undefined;
+            });
+        }
+
+        // 获取前/后缀长度
+        const startLength = start.length;
+        const endLength = end.length;
+        const idx = (startLength ? 1 : 0) + (endLength ? 2 : 0);
+
+        // 匹配前缀
+        if (idx === 1) {
+            return rules.push((id, context) => {
+                if (id.startsWith(start)) {
+                    return resolve(id.slice(startLength), context);
+                }
+            });
+        }
+
+        // 匹配后缀
+        if (idx === 2) {
+            return rules.push((id, context) => {
+                if (id.endsWith(end)) {
+                    return resolve(id.slice(0, - endLength), context);
+                }
+            });
+        }
+
+        // 匹配前缀和后缀
+        if (idx === 3) {
+            return rules.push((id, context) => {
+                if (id.startsWith(start) && id.endsWith(end)) {
+                    return resolve(id.slice(startLength, - endLength), context);
+                }
+            });
+        }
+
+        // 默认完全匹配
+        return rules.push((id, context) => resolve(id, context));
+    });
+
+    // 组件规则解析方法
+    if (rules.length) {
+        return resolver.wrapHandler(compose([...rules, resolver.resolveModule]));
+    } else {
+        return resolvePath;
+    }
+}
+
+
+/**
+ *****************************************
+ * 创建别名解析器
+ *****************************************
+ */
+function createAliasResolver(resolver: FileResolver, options: Options): Handler {
+    const resolvePaths = createPathsResolver(resolver, options);
+    const rules: Handler[] = [];
+
+    // 解析别名
+    each(options.alias, (value, key) => {
+        const paths = normalizePaths(value);
+
+        // 校验参数
+        if (!paths) {
+            return;
+        }
+
+        // 生成解析函数
+        const resolve: Handler = compose(
+            paths.map(start => (id, context) => resolvePaths(start + id, context))
+        );
+
+        // 绝对匹配
+        if (key.endsWith('$')) {
+
+            // 去除匹配符
+            key = key.slice(0, -1);
+
+            // 添加匹配规则
+            return rules.push(
+                (id, context) => (id === key ? resolve('', context) : undefined)
+            );
+        }
+
+        // 生成配置前缀
+        const prefix = key + '/';
+        const prefixLength = key.length;
+
+        // 添加匹配规则
+        return rules.push(
+            (id, context) => (id === key ? resolve('', context) : undefined),
+            (id, context) => (id.startsWith(prefix) ? resolve(id.slice(prefixLength), context) : undefined)
+        );
+    });
+
+    // 返回解析函数
+    if (rules.length) {
+        return resolver.wrapHandler(compose([...rules, resolvePaths]));
+    } else {
+        return resolvePaths;
+    }
+}
+
+
+/**
+ *****************************************
+ * 选项
+ *****************************************
+ */
+export interface Options extends FileOptions {
+    baseUrl?: string;
+    paths?: {
+        [key: string]: string[];
+    };
+    alias?: {
+        [key: string]: string | string[];
+    };
+}
+
+
+/**
+ *****************************************
+ * 解析文件
+ *****************************************
+ */
+export function resolvePath(options: Options = {}): Handler {
+    const modules = options.modules || ['node_modules'];
+
+    // 添加基准模块解析
+    if (options.baseUrl || options.paths) {
+        modules.unshift(options.baseUrl || '.');
+    }
+
+    // 创建文件解析器
+    const resolver = createFileResolver({ ...options, modules });
+
+    // 返回解析函数
+    return createAliasResolver(resolver, options);
+}

package/src/stat.ts

@@ -21,7 +21,7 @@ import * as path from 'path';
  * 状态
  *****************************************
  */
-interface State extends fs.Stats {
+export interface State extends fs.Stats {
     path: string;
 }
 

package/src/supdir.ts

@@ -16,6 +16,37 @@ import * as path from 'path';
 import { dirname } from './dirname';
 
 
+/**
+ *****************************************
+ * 遍历目录
+ *****************************************
+ */
+export function mapdir(dir: string, handler: (dir: string) => void): void {
+    const resolveFrom = path.resolve(dir);
+    const sep = path.sep;
+    const end = resolveFrom.indexOf(sep);
+
+    // 不存在结束符
+    if (end < 0) {
+        return handler(resolveFrom);
+    }
+
+    // 遍历目录
+    for (let idx = resolveFrom.length; idx >= end; ) {
+
+        // 执行回调
+        if (idx === 0) {
+            return handler('/');
+        } else {
+            handler(resolveFrom.slice(0, idx));
+        }
+
+        // 更新索引
+        idx = resolveFrom.lastIndexOf(sep, idx - 1);
+    }
+}
+
+
 /**
  *****************************************
  * 查找上一级目录回调

package/src/writeFile.ts

@@ -25,7 +25,7 @@ import { dirname } from './dirname';
 interface Options {
     encoding?: string;
     append?: boolean;
-    mode?: string;
+    mode?: fs.Mode;
     flag?: string;
 }
 
@@ -35,24 +35,27 @@ interface Options {
  * 写入文件
  *****************************************
  */
-function writeFile(path: string, content: string | Buffer): void;
+function writeFile(path: string, content?: string | Buffer): void;
 function writeFile(path: string, content: string | Buffer, encoding: string): void;
 function writeFile(path: string, content: string | Buffer, append: boolean): void;
 function writeFile(path: string, content: string | Buffer, { append, encoding, mode, flag }: Options): void;
-function writeFile(path: string, content: string | Buffer, options?: string | boolean | Options): void {
+function writeFile(path: string, content?: string | Buffer, options?: string | boolean | Options): void {
 
     // 默认配置
     if (!options) {
         options = { encoding: 'utf8' };
     }
 
-    // 校验配置
-    if (typeof options === 'object') {
+    // 默认值
+    if (typeof content === 'undefined') {
+        content = '';
+    }
 
-        // 创建目录
-        mkdir(dirname(path));
+    // 创建目录
+    mkdir(dirname(path));
 
-        // 写入文件
+    // 校验配置
+    if (typeof options === 'object') {
         if (options.append) {
             return fs.appendFileSync(path, content, options as fs.WriteFileOptions);
         } else {

package/dist/resolveAlias.d.ts

@@ -1,21 +0,0 @@
-/**
- *****************************************
- * 别名配置
- *****************************************
- */
-export interface Options {
-    baseUrl?: string;
-    paths?: {
-        [key: string]: string[];
-    };
-    alias?: {
-        [key: string]: string;
-    };
-}
-/**
- *****************************************
- * 解析路径别名
- *****************************************
- */
-export declare function resolveAlias(options: Options): (source: string) => string;
-//# sourceMappingURL=resolveAlias.d.ts.map

package/dist/resolveAlias.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolveAlias.d.ts","sourceRoot":"","sources":["../src/resolveAlias.ts"],"names":[],"mappings":"AAsGA;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;IACpC,KAAK,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACrC;AAGD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAiCzE"}