@wener/common 2.0.3 → 2.0.6

package/lib/resource/schema/types.test.js

@@ -1,14 +1,17 @@
-import { describe, it } from "vitest";
-import { createSchemaData, toJsonSchema } from "../../schema/index.js";
-import { renderJsonSchemaToMarkdownDoc } from "../../tools/renderJsonSchemaToMarkdownDoc.js";
-import { AnyResourceSchema } from "./AnyResourceSchema.js";
-describe("schema", function () {
-    it("should be convert to jsonschema", function () {
-        console.log(renderJsonSchemaToMarkdownDoc(toJsonSchema(AnyResourceSchema)));
-    });
-    it("should create from schema", function () {
-        console.log(createSchemaData(AnyResourceSchema, {
-            all: true
-        }));
-    });
+import { describe, it } from 'vitest';
+import { createSchemaData, toJsonSchema } from '../../schema/index.js';
+import { renderJsonSchemaToMarkdownDoc } from '../../tools/renderJsonSchemaToMarkdownDoc.js';
+import { AnyResourceSchema } from './AnyResourceSchema.js';
+
+describe('schema', () => {
+	it('should be convert to jsonschema', () => {
+		console.log(renderJsonSchemaToMarkdownDoc(toJsonSchema(AnyResourceSchema)));
+	});
+	it('should create from schema', () => {
+		console.log(
+			createSchemaData(AnyResourceSchema, {
+				all: true,
+			}),
+		);
+	});
 });

package/lib/s3/formatS3Url.js

@@ -1,65 +1,65 @@
 function isValidBucketName(bucket) {
-    const bucketRegex = /^[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]$/;
-    return bucketRegex.test(bucket) && !bucket.includes('..') && !bucket.includes('.-') && !bucket.includes('-.');
+	const bucketRegex = /^[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]$/;
+	return bucketRegex.test(bucket) && !bucket.includes('..') && !bucket.includes('.-') && !bucket.includes('-.');
 }
 export function formatS3Url(o, { credentials, useParams } = {}) {
-    if (!o || typeof o !== 'object') {
-        throw new Error('S3 options must be an object');
-    }
-    if (!o.endpoint) {
-        throw new Error('Endpoint is required');
-    }
-    let url;
-    let ep = o.endpoint || 's3.amazonaws.com';
-    try {
-        if (URL.canParse(ep)) {
-            url = new URL(ep);
-        } else {
-            url = new URL(`https://${ep}`);
-        }
-    } catch (error) {
-        throw new Error(`Invalid endpoint: ${ep}`);
-    }
-    const { useSsl = true, region, pathStyle, port, accessKeyId, secretAccessKey, bucket } = o;
-    url.protocol = useSsl ? 'https:' : 'http:';
-    if (credentials) {
-        if (accessKeyId && secretAccessKey) {
-            url.username = encodeURIComponent(accessKeyId);
-            url.password = encodeURIComponent(secretAccessKey);
-        } else {
-            throw new Error('Access Key ID and Secret Access Key are required for credentials');
-        }
-    }
-    if (useParams) {
-        if (region) {
-            url.searchParams.set('region', region);
-        }
-        if (pathStyle !== undefined) {
-            url.searchParams.set('pathStyle', String(pathStyle));
-        }
-    }
-    if (port) {
-        const portNum = Number(port);
-        if (isNaN(portNum) || portNum < 1 || portNum > 65535) {
-            throw new Error('Port must be a valid number between 1 and 65535');
-        }
-        url.port = String(portNum);
-    }
-    if (bucket) {
-        if (!isValidBucketName(bucket)) {
-            throw new Error(`Invalid bucket name: ${bucket}`);
-        }
-        if (pathStyle) {
-            url.pathname = `/${bucket}${url.pathname}`;
-        } else {
-            // Check if bucket is already in hostname (virtual-hosted style)
-            const bucketPattern = new RegExp(`^${bucket.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\.`);
-            if (!bucketPattern.test(url.hostname)) {
-                url.hostname = `${bucket}.${url.hostname}`;
-            }
-        }
-    }
-    return url.toString();
+	if (!o || typeof o !== 'object') {
+		throw new Error('S3 options must be an object');
+	}
+	if (!o.endpoint) {
+		throw new Error('Endpoint is required');
+	}
+	let url;
+	let ep = o.endpoint || 's3.amazonaws.com';
+	try {
+		if (URL.canParse(ep)) {
+			url = new URL(ep);
+		} else {
+			url = new URL(`https://${ep}`);
+		}
+	} catch (_error) {
+		throw new Error(`Invalid endpoint: ${ep}`);
+	}
+	const { useSsl = true, region, pathStyle, port, accessKeyId, secretAccessKey, bucket } = o;
+	url.protocol = useSsl ? 'https:' : 'http:';
+	if (credentials) {
+		if (accessKeyId && secretAccessKey) {
+			url.username = encodeURIComponent(accessKeyId);
+			url.password = encodeURIComponent(secretAccessKey);
+		} else {
+			throw new Error('Access Key ID and Secret Access Key are required for credentials');
+		}
+	}
+	if (useParams) {
+		if (region) {
+			url.searchParams.set('region', region);
+		}
+		if (pathStyle !== undefined) {
+			url.searchParams.set('pathStyle', String(pathStyle));
+		}
+	}
+	if (port) {
+		const portNum = Number(port);
+		if (Number.isNaN(portNum) || portNum < 1 || portNum > 65535) {
+			throw new Error('Port must be a valid number between 1 and 65535');
+		}
+		url.port = String(portNum);
+	}
+	if (bucket) {
+		if (!isValidBucketName(bucket)) {
+			throw new Error(`Invalid bucket name: ${bucket}`);
+		}
+		if (pathStyle) {
+			url.pathname = `/${bucket}${url.pathname}`;
+		} else {
+			// Check if bucket is already in hostname (virtual-hosted style)
+			const bucketPattern = new RegExp(`^${bucket.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\.`);
+			if (!bucketPattern.test(url.hostname)) {
+				url.hostname = `${bucket}.${url.hostname}`;
+			}
+		}
+	}
+	return url.toString();
 }
 
-//# sourceMappingURL=formatS3Url.js.map
+//# sourceMappingURL=formatS3Url.js.map

package/lib/s3/formatS3Url.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/s3/formatS3Url.ts"],"sourcesContent":["import type { ParsedS3Options } from './parseS3Url';\n\nfunction isValidBucketName(bucket: string): boolean {\n\tconst bucketRegex = /^[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]$/;\n\treturn bucketRegex.test(bucket) && !bucket.includes('..') && !bucket.includes('.-') && !bucket.includes('-.');\n}\n\nexport function formatS3Url(\n\to: ParsedS3Options,\n\t{\n\t\tcredentials,\n\t\tuseParams,\n\t}: {\n\t\tcredentials?: boolean;\n\t\tuseParams?: boolean;\n\t} = {},\n): string {\n\tif (!o || typeof o !== 'object') {\n\t\tthrow new Error('S3 options must be an object');\n\t}\n\n\tif (!o.endpoint) {\n\t\tthrow new Error('Endpoint is required');\n\t}\n\n\tlet url: URL;\n\tlet ep = o.endpoint || 's3.amazonaws.com';\n\ttry {\n\t\tif (URL.canParse(ep)) {\n\t\t\turl = new URL(ep);\n\t\t} else {\n\t\t\turl = new URL(`https://${ep}`);\n\t\t}\n\t} catch (error) {\n\t\tthrow new Error(`Invalid endpoint: ${ep}`);\n\t}\n\n\tconst { useSsl = true, region, pathStyle, port, accessKeyId, secretAccessKey, bucket } = o;\n\turl.protocol = useSsl ? 'https:' : 'http:';\n\n\tif (credentials) {\n\t\tif (accessKeyId && secretAccessKey) {\n\t\t\turl.username = encodeURIComponent(accessKeyId);\n\t\t\turl.password = encodeURIComponent(secretAccessKey);\n\t\t} else {\n\t\t\tthrow new Error('Access Key ID and Secret Access Key are required for credentials');\n\t\t}\n\t}\n\n\tif (useParams) {\n\t\tif (region) {\n\t\t\turl.searchParams.set('region', region);\n\t\t}\n\t\tif (pathStyle !== undefined) {\n\t\t\turl.searchParams.set('pathStyle', String(pathStyle));\n\t\t}\n\t}\n\n\tif (port) {\n\t\tconst portNum = Number(port);\n\t\tif (isNaN(portNum) || portNum < 1 || portNum > 65535) {\n\t\t\tthrow new Error('Port must be a valid number between 1 and 65535');\n\t\t}\n\t\turl.port = String(portNum);\n\t}\n\n\tif (bucket) {\n\t\tif (!isValidBucketName(bucket)) {\n\t\t\tthrow new Error(`Invalid bucket name: ${bucket}`);\n\t\t}\n\n\t\tif (pathStyle) {\n\t\t\turl.pathname = `/${bucket}${url.pathname}`;\n\t\t} else {\n\t\t\t// Check if bucket is already in hostname (virtual-hosted style)\n\t\t\tconst bucketPattern = new RegExp(`^${bucket.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&')}\\\\.`);\n\t\t\tif (!bucketPattern.test(url.hostname)) {\n\t\t\t\turl.hostname = `${bucket}.${url.hostname}`;\n\t\t\t}\n\t\t}\n\t}\n\n\treturn url.toString();\n}\n"],"names":["isValidBucketName","bucket","bucketRegex","test","includes","formatS3Url","o","credentials","useParams","Error","endpoint","url","ep","URL","canParse","error","useSsl","region","pathStyle","port","accessKeyId","secretAccessKey","protocol","username","encodeURIComponent","password","searchParams","set","undefined","String","portNum","Number","isNaN","pathname","bucketPattern","RegExp","replace","hostname","toString"],"mappings":"AAEA,SAASA,kBAAkBC,MAAc;IACxC,MAAMC,cAAc;IACpB,OAAOA,YAAYC,IAAI,CAACF,WAAW,CAACA,OAAOG,QAAQ,CAAC,SAAS,CAACH,OAAOG,QAAQ,CAAC,SAAS,CAACH,OAAOG,QAAQ,CAAC;AACzG;AAEA,OAAO,SAASC,YACfC,CAAkB,EAClB,EACCC,WAAW,EACXC,SAAS,EAIT,GAAG,CAAC,CAAC;IAEN,IAAI,CAACF,KAAK,OAAOA,MAAM,UAAU;QAChC,MAAM,IAAIG,MAAM;IACjB;IAEA,IAAI,CAACH,EAAEI,QAAQ,EAAE;QAChB,MAAM,IAAID,MAAM;IACjB;IAEA,IAAIE;IACJ,IAAIC,KAAKN,EAAEI,QAAQ,IAAI;IACvB,IAAI;QACH,IAAIG,IAAIC,QAAQ,CAACF,KAAK;YACrBD,MAAM,IAAIE,IAAID;QACf,OAAO;YACND,MAAM,IAAIE,IAAI,CAAC,QAAQ,EAAED,IAAI;QAC9B;IACD,EAAE,OAAOG,OAAO;QACf,MAAM,IAAIN,MAAM,CAAC,kBAAkB,EAAEG,IAAI;IAC1C;IAEA,MAAM,EAAEI,SAAS,IAAI,EAAEC,MAAM,EAAEC,SAAS,EAAEC,IAAI,EAAEC,WAAW,EAAEC,eAAe,EAAEpB,MAAM,EAAE,GAAGK;IACzFK,IAAIW,QAAQ,GAAGN,SAAS,WAAW;IAEnC,IAAIT,aAAa;QAChB,IAAIa,eAAeC,iBAAiB;YACnCV,IAAIY,QAAQ,GAAGC,mBAAmBJ;YAClCT,IAAIc,QAAQ,GAAGD,mBAAmBH;QACnC,OAAO;YACN,MAAM,IAAIZ,MAAM;QACjB;IACD;IAEA,IAAID,WAAW;QACd,IAAIS,QAAQ;YACXN,IAAIe,YAAY,CAACC,GAAG,CAAC,UAAUV;QAChC;QACA,IAAIC,cAAcU,WAAW;YAC5BjB,IAAIe,YAAY,CAACC,GAAG,CAAC,aAAaE,OAAOX;QAC1C;IACD;IAEA,IAAIC,MAAM;QACT,MAAMW,UAAUC,OAAOZ;QACvB,IAAIa,MAAMF,YAAYA,UAAU,KAAKA,UAAU,OAAO;YACrD,MAAM,IAAIrB,MAAM;QACjB;QACAE,IAAIQ,IAAI,GAAGU,OAAOC;IACnB;IAEA,IAAI7B,QAAQ;QACX,IAAI,CAACD,kBAAkBC,SAAS;YAC/B,MAAM,IAAIQ,MAAM,CAAC,qBAAqB,EAAER,QAAQ;QACjD;QAEA,IAAIiB,WAAW;YACdP,IAAIsB,QAAQ,GAAG,CAAC,CAAC,EAAEhC,SAASU,IAAIsB,QAAQ,EAAE;QAC3C,OAAO;YACN,gEAAgE;YAChE,MAAMC,gBAAgB,IAAIC,OAAO,CAAC,CAAC,EAAElC,OAAOmC,OAAO,CAAC,uBAAuB,QAAQ,GAAG,CAAC;YACvF,IAAI,CAACF,cAAc/B,IAAI,CAACQ,IAAI0B,QAAQ,GAAG;gBACtC1B,IAAI0B,QAAQ,GAAG,GAAGpC,OAAO,CAAC,EAAEU,IAAI0B,QAAQ,EAAE;YAC3C;QACD;IACD;IAEA,OAAO1B,IAAI2B,QAAQ;AACpB"}
+{"version":3,"sources":["../../src/s3/formatS3Url.ts"],"sourcesContent":["import type { ParsedS3Options } from './parseS3Url';\n\nfunction isValidBucketName(bucket: string): boolean {\n\tconst bucketRegex = /^[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]$/;\n\treturn bucketRegex.test(bucket) && !bucket.includes('..') && !bucket.includes('.-') && !bucket.includes('-.');\n}\n\nexport function formatS3Url(\n\to: ParsedS3Options,\n\t{\n\t\tcredentials,\n\t\tuseParams,\n\t}: {\n\t\tcredentials?: boolean;\n\t\tuseParams?: boolean;\n\t} = {},\n): string {\n\tif (!o || typeof o !== 'object') {\n\t\tthrow new Error('S3 options must be an object');\n\t}\n\n\tif (!o.endpoint) {\n\t\tthrow new Error('Endpoint is required');\n\t}\n\n\tlet url: URL;\n\tlet ep = o.endpoint || 's3.amazonaws.com';\n\ttry {\n\t\tif (URL.canParse(ep)) {\n\t\t\turl = new URL(ep);\n\t\t} else {\n\t\t\turl = new URL(`https://${ep}`);\n\t\t}\n\t} catch (_error) {\n\t\tthrow new Error(`Invalid endpoint: ${ep}`);\n\t}\n\n\tconst { useSsl = true, region, pathStyle, port, accessKeyId, secretAccessKey, bucket } = o;\n\turl.protocol = useSsl ? 'https:' : 'http:';\n\n\tif (credentials) {\n\t\tif (accessKeyId && secretAccessKey) {\n\t\t\turl.username = encodeURIComponent(accessKeyId);\n\t\t\turl.password = encodeURIComponent(secretAccessKey);\n\t\t} else {\n\t\t\tthrow new Error('Access Key ID and Secret Access Key are required for credentials');\n\t\t}\n\t}\n\n\tif (useParams) {\n\t\tif (region) {\n\t\t\turl.searchParams.set('region', region);\n\t\t}\n\t\tif (pathStyle !== undefined) {\n\t\t\turl.searchParams.set('pathStyle', String(pathStyle));\n\t\t}\n\t}\n\n\tif (port) {\n\t\tconst portNum = Number(port);\n\t\tif (Number.isNaN(portNum) || portNum < 1 || portNum > 65535) {\n\t\t\tthrow new Error('Port must be a valid number between 1 and 65535');\n\t\t}\n\t\turl.port = String(portNum);\n\t}\n\n\tif (bucket) {\n\t\tif (!isValidBucketName(bucket)) {\n\t\t\tthrow new Error(`Invalid bucket name: ${bucket}`);\n\t\t}\n\n\t\tif (pathStyle) {\n\t\t\turl.pathname = `/${bucket}${url.pathname}`;\n\t\t} else {\n\t\t\t// Check if bucket is already in hostname (virtual-hosted style)\n\t\t\tconst bucketPattern = new RegExp(`^${bucket.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&')}\\\\.`);\n\t\t\tif (!bucketPattern.test(url.hostname)) {\n\t\t\t\turl.hostname = `${bucket}.${url.hostname}`;\n\t\t\t}\n\t\t}\n\t}\n\n\treturn url.toString();\n}\n"],"names":["isValidBucketName","bucket","bucketRegex","test","includes","formatS3Url","o","credentials","useParams","Error","endpoint","url","ep","URL","canParse","_error","useSsl","region","pathStyle","port","accessKeyId","secretAccessKey","protocol","username","encodeURIComponent","password","searchParams","set","undefined","String","portNum","Number","isNaN","pathname","bucketPattern","RegExp","replace","hostname","toString"],"mappings":"AAEA,SAASA,kBAAkBC,MAAc;IACxC,MAAMC,cAAc;IACpB,OAAOA,YAAYC,IAAI,CAACF,WAAW,CAACA,OAAOG,QAAQ,CAAC,SAAS,CAACH,OAAOG,QAAQ,CAAC,SAAS,CAACH,OAAOG,QAAQ,CAAC;AACzG;AAEA,OAAO,SAASC,YACfC,CAAkB,EAClB,EACCC,WAAW,EACXC,SAAS,EAIT,GAAG,CAAC,CAAC;IAEN,IAAI,CAACF,KAAK,OAAOA,MAAM,UAAU;QAChC,MAAM,IAAIG,MAAM;IACjB;IAEA,IAAI,CAACH,EAAEI,QAAQ,EAAE;QAChB,MAAM,IAAID,MAAM;IACjB;IAEA,IAAIE;IACJ,IAAIC,KAAKN,EAAEI,QAAQ,IAAI;IACvB,IAAI;QACH,IAAIG,IAAIC,QAAQ,CAACF,KAAK;YACrBD,MAAM,IAAIE,IAAID;QACf,OAAO;YACND,MAAM,IAAIE,IAAI,CAAC,QAAQ,EAAED,IAAI;QAC9B;IACD,EAAE,OAAOG,QAAQ;QAChB,MAAM,IAAIN,MAAM,CAAC,kBAAkB,EAAEG,IAAI;IAC1C;IAEA,MAAM,EAAEI,SAAS,IAAI,EAAEC,MAAM,EAAEC,SAAS,EAAEC,IAAI,EAAEC,WAAW,EAAEC,eAAe,EAAEpB,MAAM,EAAE,GAAGK;IACzFK,IAAIW,QAAQ,GAAGN,SAAS,WAAW;IAEnC,IAAIT,aAAa;QAChB,IAAIa,eAAeC,iBAAiB;YACnCV,IAAIY,QAAQ,GAAGC,mBAAmBJ;YAClCT,IAAIc,QAAQ,GAAGD,mBAAmBH;QACnC,OAAO;YACN,MAAM,IAAIZ,MAAM;QACjB;IACD;IAEA,IAAID,WAAW;QACd,IAAIS,QAAQ;YACXN,IAAIe,YAAY,CAACC,GAAG,CAAC,UAAUV;QAChC;QACA,IAAIC,cAAcU,WAAW;YAC5BjB,IAAIe,YAAY,CAACC,GAAG,CAAC,aAAaE,OAAOX;QAC1C;IACD;IAEA,IAAIC,MAAM;QACT,MAAMW,UAAUC,OAAOZ;QACvB,IAAIY,OAAOC,KAAK,CAACF,YAAYA,UAAU,KAAKA,UAAU,OAAO;YAC5D,MAAM,IAAIrB,MAAM;QACjB;QACAE,IAAIQ,IAAI,GAAGU,OAAOC;IACnB;IAEA,IAAI7B,QAAQ;QACX,IAAI,CAACD,kBAAkBC,SAAS;YAC/B,MAAM,IAAIQ,MAAM,CAAC,qBAAqB,EAAER,QAAQ;QACjD;QAEA,IAAIiB,WAAW;YACdP,IAAIsB,QAAQ,GAAG,CAAC,CAAC,EAAEhC,SAASU,IAAIsB,QAAQ,EAAE;QAC3C,OAAO;YACN,gEAAgE;YAChE,MAAMC,gBAAgB,IAAIC,OAAO,CAAC,CAAC,EAAElC,OAAOmC,OAAO,CAAC,uBAAuB,QAAQ,GAAG,CAAC;YACvF,IAAI,CAACF,cAAc/B,IAAI,CAACQ,IAAI0B,QAAQ,GAAG;gBACtC1B,IAAI0B,QAAQ,GAAG,GAAGpC,OAAO,CAAC,EAAEU,IAAI0B,QAAQ,EAAE;YAC3C;QACD;IACD;IAEA,OAAO1B,IAAI2B,QAAQ;AACpB"}