@8ms/helpers 3.2.8 → 3.2.9

package/dist/aws/s3/server/AwsS3.cjs

@@ -3,9 +3,9 @@ const require_runtime = require("../../../_virtual/_rolldown/runtime.cjs");
 const require__class__shared_BaseNamespace = require("../../../_class/_shared/BaseNamespace.cjs");
 const require_date__shared_calculation = require("../../../date/_shared/calculation.cjs");
 const require_date__shared_format = require("../../../date/_shared/format.cjs");
+const require_aws_server_isResponse200 = require("../../server/isResponse200.cjs");
 const require_date__shared_date = require("../../../date/_shared/date.cjs");
 require("../../../date/_shared/index.cjs");
-const require_aws_server_isResponse200 = require("../../server/isResponse200.cjs");
 const require_stream_server_json_read = require("../../../stream/server/json/read.cjs");
 const require_stream_server_json_write = require("../../../stream/server/json/write.cjs");
 require("../../../stream/server/index.cjs");

package/dist/aws/s3/server/AwsS3.mjs

@@ -1,9 +1,9 @@
 import { BaseNamespace } from "../../../_class/_shared/BaseNamespace.mjs";
 import { getToday } from "../../../date/_shared/calculation.mjs";
 import { getYmdHisString } from "../../../date/_shared/format.mjs";
+import { isResponse200 } from "../../server/isResponse200.mjs";
 import { defaultDateTime } from "../../../date/_shared/date.mjs";
 import "../../../date/_shared/index.mjs";
-import { isResponse200 } from "../../server/isResponse200.mjs";
 import { readJsonGzipStream, readJsonStream } from "../../../stream/server/json/read.mjs";
 import { writeJsonGzipStream, writeJsonStream } from "../../../stream/server/json/write.mjs";
 import "../../../stream/server/index.mjs";

package/dist/googleCloud/bigquery/_shared/types.d.cts

@@ -49,24 +49,13 @@ export type LoadData<TData> = {
     datasetId: string;
     tableId?: string;
     region?: string;
-    definition: TableDefinition;
-    options?: TableDefinition["options"];
+    definition?: TableDefinition;
   };
 };
 export type LoadTableProps = LoadData<any[]>;
 export type LoadStreamTableProps = LoadData<RowSource<any>>;
-export type MergeTableProps = {
-  googleCloudStorage: GoogleCloudStorage;
-  file: {
-    bucket: string;
-    key: string;
-    data: any[];
-  };
-  table: {
-    datasetId: string;
-    tableId?: string;
-    region?: string;
-    definition: TableDefinition;
+export type MergeTableProps = Omit<LoadData<any[]>, "table"> & {
+  table: LoadData<any[]>["table"] & {
     mergeKey: string;
     updateColumns: string[];
   };

package/dist/googleCloud/bigquery/_shared/types.d.mts

@@ -49,24 +49,13 @@ export type LoadData<TData> = {
     datasetId: string;
     tableId?: string;
     region?: string;
-    definition: TableDefinition;
-    options?: TableDefinition["options"];
+    definition?: TableDefinition;
   };
 };
 export type LoadTableProps = LoadData<any[]>;
 export type LoadStreamTableProps = LoadData<RowSource<any>>;
-export type MergeTableProps = {
-  googleCloudStorage: GoogleCloudStorage;
-  file: {
-    bucket: string;
-    key: string;
-    data: any[];
-  };
-  table: {
-    datasetId: string;
-    tableId?: string;
-    region?: string;
-    definition: TableDefinition;
+export type MergeTableProps = Omit<LoadData<any[]>, "table"> & {
+  table: LoadData<any[]>["table"] & {
     mergeKey: string;
     updateColumns: string[];
   };

package/dist/googleCloud/bigquery/server/GoogleCloudBigquery.cjs

@@ -147,13 +147,15 @@ var GoogleCloudBigquery = class extends require__class__shared_BaseNamespace.Bas
 	* pre-checking existence and silently skipping the load if it isn't there.
 	*/
 	loadData = async (props) => {
-		const finalTableId = props.table.tableId;
-		await this.createTable(props.table.datasetId, {}, finalTableId, props.table.options);
-		await this.client.dataset(props.table.datasetId, { location: props.table.region }).table(finalTableId).load(props.googleCloudStorage.client.bucket(props.file.bucket).file(props.file.key), {
+		const finalTableId = props.table.tableId ?? props.table.definition?.tableId;
+		if (!finalTableId) throw new Error("loadData requires either table.tableId or table.definition.tableId");
+		const finalRegion = props.table.region ?? this.region;
+		await this.createTable(props.table.datasetId, {}, finalTableId, props.table.definition?.options);
+		await this.client.dataset(props.table.datasetId, { location: finalRegion }).table(finalTableId).load(props.googleCloudStorage.client.bucket(props.file.bucket).file(props.file.key), {
 			autodetect: true,
 			sourceFormat: bigQuerySourceFormat[props.file.sourceFormat ?? require_file__shared_fileType.fileType.JSON_NEWLINE],
 			schemaUpdateOptions: ["ALLOW_FIELD_ADDITION"],
-			location: props.table.region
+			location: finalRegion
 		});
 	};
 	/**
@@ -163,17 +165,10 @@ var GoogleCloudBigquery = class extends require__class__shared_BaseNamespace.Bas
 	* this library has no Parquet encoder.
 	*/
 	loadTable = async (props) => {
-		const finalTableId = props.table.tableId ?? props.table.definition.tableId;
 		const fileSourceFormat = props.file.sourceFormat ?? require_file__shared_fileType.fileType.JSON_NEWLINE;
 		const finalData = require_file__shared_fileType.fileType.JSON_NEWLINE === fileSourceFormat ? require_json__shared_getJsonNewline.getJsonNewline(props.file.data) : props.file.data;
 		await props.googleCloudStorage.writeFile(props.file.bucket, props.file.key, finalData);
-		await this.loadData({
-			...props,
-			table: {
-				...props.table,
-				tableId: finalTableId
-			}
-		});
+		await this.loadData(props);
 	};
 	/**
 	* Same as loadTable, but streams a row source into Google Cloud Storage instead of buffering the
@@ -184,7 +179,6 @@ var GoogleCloudBigquery = class extends require__class__shared_BaseNamespace.Bas
 	* byte-level Readable of encoded Parquet content, piped straight through.
 	*/
 	loadStreamTable = async (props) => {
-		const finalTableId = props.table.tableId ?? props.table.definition.tableId;
 		const fileSourceFormat = props.file.sourceFormat ?? require_file__shared_fileType.fileType.JSON_NEWLINE;
 		const destination = props.googleCloudStorage.client.bucket(props.file.bucket).file(props.file.key).createWriteStream({
 			contentType: require_file__shared_fileMimeType.fileMimeType[fileSourceFormat],
@@ -197,13 +191,7 @@ var GoogleCloudBigquery = class extends require__class__shared_BaseNamespace.Bas
 			destination
 		]);
 		else await (0, node_stream_promises.pipeline)([source, destination]);
-		await this.loadData({
-			...props,
-			table: {
-				...props.table,
-				tableId: finalTableId
-			}
-		});
+		await this.loadData(props);
 	};
 	/**
 	* Brings an existing table's clustering in line with `definition.options.clustering`, if it differs.
@@ -226,15 +214,17 @@ var GoogleCloudBigquery = class extends require__class__shared_BaseNamespace.Bas
 	*/
 	mergeTable = async (props) => {
 		if (0 === props.file.data.length) return;
-		const finalTableId = props.table.tableId ?? props.table.definition.tableId;
-		if (await this.tableExists(props.table.datasetId, finalTableId)) await this.syncTableClustering(props.table.datasetId, finalTableId, props.table.definition.options?.clustering);
+		const finalTableId = props.table.tableId ?? props.table.definition?.tableId;
+		if (!finalTableId) throw new Error("mergeTable requires either table.tableId or table.definition.tableId");
+		if (await this.tableExists(props.table.datasetId, finalTableId)) await this.syncTableClustering(props.table.datasetId, finalTableId, props.table.definition?.options?.clustering);
 		const stagingTableId = `${finalTableId}_staging_${require_date__shared_format.getYmdHisNumber()}`;
 		const stagingTableRef = `\`${props.table.datasetId}.${stagingTableId}\``;
 		try {
 			const stagingDefinition = {
 				...props.table.definition,
+				datasetId: props.table.datasetId,
 				tableId: stagingTableId,
-				options: props.table.definition.options ? {
+				options: props.table.definition?.options ? {
 					...props.table.definition.options,
 					timePartitioning: void 0,
 					clustering: void 0
@@ -252,7 +242,7 @@ var GoogleCloudBigquery = class extends require__class__shared_BaseNamespace.Bas
 			});
 			const mainTableRef = `\`${props.table.datasetId}.${finalTableId}\``;
 			const updateSet = props.table.updateColumns.map((column) => `${column} = S.${column}`).join(", ");
-			const allColumns = props.table.definition.options?.schema.map((field) => field.name) ?? [];
+			const allColumns = props.table.definition?.options?.schema.map((field) => field.name) ?? [];
 			const mergeQuery = `
 				MERGE ${mainTableRef} AS T
 				USING ${stagingTableRef} AS S

package/dist/googleCloud/bigquery/server/GoogleCloudBigquery.mjs

@@ -146,13 +146,15 @@ var GoogleCloudBigquery = class extends BaseNamespace {
 	* pre-checking existence and silently skipping the load if it isn't there.
 	*/
 	loadData = async (props) => {
-		const finalTableId = props.table.tableId;
-		await this.createTable(props.table.datasetId, {}, finalTableId, props.table.options);
-		await this.client.dataset(props.table.datasetId, { location: props.table.region }).table(finalTableId).load(props.googleCloudStorage.client.bucket(props.file.bucket).file(props.file.key), {
+		const finalTableId = props.table.tableId ?? props.table.definition?.tableId;
+		if (!finalTableId) throw new Error("loadData requires either table.tableId or table.definition.tableId");
+		const finalRegion = props.table.region ?? this.region;
+		await this.createTable(props.table.datasetId, {}, finalTableId, props.table.definition?.options);
+		await this.client.dataset(props.table.datasetId, { location: finalRegion }).table(finalTableId).load(props.googleCloudStorage.client.bucket(props.file.bucket).file(props.file.key), {
 			autodetect: true,
 			sourceFormat: bigQuerySourceFormat[props.file.sourceFormat ?? fileType.JSON_NEWLINE],
 			schemaUpdateOptions: ["ALLOW_FIELD_ADDITION"],
-			location: props.table.region
+			location: finalRegion
 		});
 	};
 	/**
@@ -162,17 +164,10 @@ var GoogleCloudBigquery = class extends BaseNamespace {
 	* this library has no Parquet encoder.
 	*/
 	loadTable = async (props) => {
-		const finalTableId = props.table.tableId ?? props.table.definition.tableId;
 		const fileSourceFormat = props.file.sourceFormat ?? fileType.JSON_NEWLINE;
 		const finalData = fileType.JSON_NEWLINE === fileSourceFormat ? getJsonNewline(props.file.data) : props.file.data;
 		await props.googleCloudStorage.writeFile(props.file.bucket, props.file.key, finalData);
-		await this.loadData({
-			...props,
-			table: {
-				...props.table,
-				tableId: finalTableId
-			}
-		});
+		await this.loadData(props);
 	};
 	/**
 	* Same as loadTable, but streams a row source into Google Cloud Storage instead of buffering the
@@ -183,7 +178,6 @@ var GoogleCloudBigquery = class extends BaseNamespace {
 	* byte-level Readable of encoded Parquet content, piped straight through.
 	*/
 	loadStreamTable = async (props) => {
-		const finalTableId = props.table.tableId ?? props.table.definition.tableId;
 		const fileSourceFormat = props.file.sourceFormat ?? fileType.JSON_NEWLINE;
 		const destination = props.googleCloudStorage.client.bucket(props.file.bucket).file(props.file.key).createWriteStream({
 			contentType: fileMimeType[fileSourceFormat],
@@ -196,13 +190,7 @@ var GoogleCloudBigquery = class extends BaseNamespace {
 			destination
 		]);
 		else await pipeline([source, destination]);
-		await this.loadData({
-			...props,
-			table: {
-				...props.table,
-				tableId: finalTableId
-			}
-		});
+		await this.loadData(props);
 	};
 	/**
 	* Brings an existing table's clustering in line with `definition.options.clustering`, if it differs.
@@ -225,15 +213,17 @@ var GoogleCloudBigquery = class extends BaseNamespace {
 	*/
 	mergeTable = async (props) => {
 		if (0 === props.file.data.length) return;
-		const finalTableId = props.table.tableId ?? props.table.definition.tableId;
-		if (await this.tableExists(props.table.datasetId, finalTableId)) await this.syncTableClustering(props.table.datasetId, finalTableId, props.table.definition.options?.clustering);
+		const finalTableId = props.table.tableId ?? props.table.definition?.tableId;
+		if (!finalTableId) throw new Error("mergeTable requires either table.tableId or table.definition.tableId");
+		if (await this.tableExists(props.table.datasetId, finalTableId)) await this.syncTableClustering(props.table.datasetId, finalTableId, props.table.definition?.options?.clustering);
 		const stagingTableId = `${finalTableId}_staging_${getYmdHisNumber()}`;
 		const stagingTableRef = `\`${props.table.datasetId}.${stagingTableId}\``;
 		try {
 			const stagingDefinition = {
 				...props.table.definition,
+				datasetId: props.table.datasetId,
 				tableId: stagingTableId,
-				options: props.table.definition.options ? {
+				options: props.table.definition?.options ? {
 					...props.table.definition.options,
 					timePartitioning: void 0,
 					clustering: void 0
@@ -251,7 +241,7 @@ var GoogleCloudBigquery = class extends BaseNamespace {
 			});
 			const mainTableRef = `\`${props.table.datasetId}.${finalTableId}\``;
 			const updateSet = props.table.updateColumns.map((column) => `${column} = S.${column}`).join(", ");
-			const allColumns = props.table.definition.options?.schema.map((field) => field.name) ?? [];
+			const allColumns = props.table.definition?.options?.schema.map((field) => field.name) ?? [];
 			const mergeQuery = `
 				MERGE ${mainTableRef} AS T
 				USING ${stagingTableRef} AS S

package/dist/xlsx/_shared/createXlsx.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_xlsx__shared_column = require("./column.cjs");
 const require_xlsx__shared_cell = require("./cell.cjs");
-const require_xlsx__shared_sheet = require("./sheet.cjs");
 const require_zip__shared_ZipArchive = require("../../zip/_shared/ZipArchive.cjs");
+const require_xlsx__shared_sheet = require("./sheet.cjs");
 //#region src/xlsx/_shared/createXlsx.ts
 /**
 * Builds a complete .xlsx workbook from scratch, using hand-written OOXML rather

package/dist/xlsx/_shared/createXlsx.mjs

@@ -1,7 +1,7 @@
 import { getColumLetter, getColumnWidth } from "./column.mjs";
 import { buildCellXml, getCellValue, getEscapedXml } from "./cell.mjs";
-import { getUniqueSheetNames } from "./sheet.mjs";
 import { ZipArchive } from "../../zip/_shared/ZipArchive.mjs";
+import { getUniqueSheetNames } from "./sheet.mjs";
 //#region src/xlsx/_shared/createXlsx.ts
 /**
 * Builds a complete .xlsx workbook from scratch, using hand-written OOXML rather

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@8ms/helpers",
 	"license": "UNLICENSED",
-	"version": "3.2.8",
+	"version": "3.2.9",
 	"packageManager": "yarn@4.18.0",
 	"repository": {
 		"type": "git",