resobjectify 2.0.1 → 2.1.0

package/dist/src/objectify.d.ts

@@ -1,11 +1,11 @@
-import type { Fields, Prettify, Row } from "../types";
+import type { Field, Prettify, Row } from "../types";
 /**
  * Transforms flat rows into nested objects/arrays based on a field definition.
  *
  * When `object` is `true`, top-level output is keyed by the first field value.
  * Otherwise the output is an array.
  */
-export declare function objectify<R = unknown, T = Row>(data: T[], fields: Fields<R, T>, object: true): Record<PropertyKey, Prettify<R>>;
-export declare function objectify<R = unknown, T = Row>(data: T[], fields: Fields<R, T>, object?: false): Prettify<R>[];
-export declare function objectify<R = unknown>(data: Row[], fields: Fields<R>, object: true): Record<PropertyKey, Prettify<R>>;
-export declare function objectify<R = unknown>(data: Row[], fields: Fields<R>, object?: false): Prettify<R>[];
+export declare function objectify<R = unknown, T = Row>(data: T[], fields: Field<R, T>[], object: true): Record<PropertyKey, Prettify<R>>;
+export declare function objectify<R = unknown, T = Row>(data: T[], fields: Field<R, T>[], object?: false): Prettify<R>[];
+export declare function objectify<R = unknown>(data: Row[], fields: Field<R>[], object: true): Record<PropertyKey, Prettify<R>>;
+export declare function objectify<R = unknown>(data: Row[], fields: Field<R>[], object?: false): Prettify<R>[];

package/dist/src/objectify.js

@@ -14,25 +14,25 @@ function objectify(data, fields, object = false) {
         const row = rows[0];
         const obj = {};
         for (const field of fields) {
-            // If the field is not an array, it is a key field, so we can get the value from the row
-            if (!Array.isArray(field)) {
-                const fieldName = getFieldName(field);
-                obj[fieldName] = getFieldValue(row, field);
-            }
-            else {
-                // If the field is an array, it is a group field, so we need to objectify the nested fields recursively
+            const fieldName = getFieldName(field);
+            // If the field is an array, it is a group field, so we need to objectify the nested fields recursively
+            if (Array.isArray(field)) {
                 const [rawGroupField, nestedFields] = field;
                 const groupField = rawGroupField;
                 const nestedObject = isObject(groupField, object);
                 obj[getGroupName(groupField)] = nestedObject
                     ? objectify(rows, nestedFields, true)
                     : objectify(rows, nestedFields, false);
+                // If the field is not an array, it is a key field, so we can get the value from the row
+            }
+            else if (fieldName !== undefined) {
+                obj[fieldName] = getFieldValue(row, field);
             }
         }
-        if (obj[name] != null) {
+        if (name === undefined || obj[name] != null) {
             // If the result is an array, we need to push the object to the array
             if (Array.isArray(result)) {
-                result.push(restFields.length ? obj : obj[name]);
+                result.push(restFields.length || name === undefined ? obj : obj[name]);
             }
             else {
                 // If the result is an object, we need to set the object to the key
@@ -51,7 +51,7 @@ function objectify(data, fields, object = false) {
 function groupByKey(rows, key) {
     const groups = new Map();
     for (const row of rows) {
-        const keyValue = row[key];
+        const keyValue = key !== undefined ? row[key] : undefined;
         const group = groups.get(keyValue);
         if (group) {
             group.push(row);
@@ -66,14 +66,20 @@ function groupByKey(rows, key) {
  * Resolves the source key from either shorthand or object field syntax.
  */
 function getKeyField(field) {
-    return (typeof field === "string" ? field : field.key);
+    if (Array.isArray(field)) {
+        return undefined;
+    }
+    return typeof field === "string" ? field : field === null || field === void 0 ? void 0 : field.key;
 }
 /**
  * Resolves the output property name for a key field.
  */
 function getFieldName(field) {
     var _a;
-    return (typeof field === "string" ? field : ((_a = field.as) !== null && _a !== void 0 ? _a : field.key));
+    if (Array.isArray(field)) {
+        return undefined;
+    }
+    return (typeof field === "string" ? field : ((_a = field === null || field === void 0 ? void 0 : field.as) !== null && _a !== void 0 ? _a : field === null || field === void 0 ? void 0 : field.key));
 }
 /**
  * Reads a row value and optionally parses it as JSON.
@@ -83,7 +89,10 @@ function getFieldValue(row, field) {
         return row[field];
     }
     const key = getKeyField(field);
-    if (field.json) {
+    if (key === undefined) {
+        return undefined;
+    }
+    if (field === null || field === void 0 ? void 0 : field.json) {
         try {
             return JSON.parse(row[key]);
         }

package/dist/types.d.ts

@@ -5,7 +5,7 @@ export type Row = Record<PropertyKey, unknown>;
 /**
  * String-only key names for a given row type.
  */
-export type KeyName<T = Row> = Extract<keyof T, string>;
+export type KeyName<T = Row> = Extract<keyof T, string> | undefined;
 /**
  * Fallback string type used when strict key extraction resolves to `never`.
  */
@@ -81,11 +81,7 @@ export type SimpleGroupField = DefaultString | {
 /**
  * Single field definition: direct key field or nested group tuple.
  */
-export type Field<R = Row, T = Row> = KeyField<R, T> | [GroupField<R>, Fields<R, T>];
-/**
- * Full field set, requiring the first entry to be a key field.
- */
-export type Fields<R = Row, T = Row> = [KeyField<R, T>, ...Field<R, T>[]];
+export type Field<R = Row, T = Row> = KeyField<R, T> | [GroupField<R>, Field<R, T>[]];
 /**
  * Extra options when defining a key field.
  */
@@ -120,6 +116,6 @@ export type FieldsBuilder<R = Row, T = Row> = {
     /**
      * Finalizes and returns the accumulated field definition tuple.
      */
-    build(): Fields<R, T>;
+    build(): Field<R, T>[];
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resobjectify",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Parse an array of one dimensional objects to nested array/object",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",