dyna-record 0.4.11 → 0.5.1

package/dist/src/relationships/JoinTable.js

@@ -79,7 +79,8 @@ class JoinTable {
         }
         return transactionResults.reduce((acc, res) => {
             if (res.Item !== undefined) {
-                acc[res.Item[idAlias]] = res.Item;
+                const id = res.Item[idAlias];
+                acc[id] = res.Item;
             }
             return acc;
         }, {});
@@ -183,8 +184,8 @@ class JoinTable {
         const tableMeta = metadata_1.default.getEntityTable(entities.parentEntity.name);
         const idAlias = tableMeta.defaultAttributes.id.alias;
         const foundEntityIds = new Set(transactionResults
-            .filter(result => result?.Item)
-            .map(result => result.Item?.[idAlias]));
+            .filter(result => result.Item !== undefined)
+            .map(result => result.Item[idAlias]));
         const missingEntities = joinedEntityData.filter(entityData => {
             return !foundEntityIds.has(entityData.entityId); // If not in Set, it's missing
         });

package/dist/src/utils.d.ts

@@ -7,7 +7,7 @@ import { type EntityAttributesOnly } from "./operations";
  * @param entityData
  * @returns
  */
-export declare const entityToTableItem: <T extends DynaRecord>(EntityClass: new () => T, entityData: Partial<DynaRecord>) => DynamoTableItem;
+export declare const entityToTableItem: (EntityClass: new () => DynaRecord, entityData: Partial<DynaRecord>) => DynamoTableItem;
 /**
  * Serialize a table item to its associated Entity class, using the class attribute property names
  * @param EntityClass
@@ -29,7 +29,7 @@ export declare const isKeyOfEntity: (entity: DynaRecord, key: string) => key is
  * @param key
  * @returns
  */
-export declare const isKeyOfObject: <T>(entity: Partial<DynaRecord>, key: any) => key is keyof T;
+export declare const isKeyOfObject: <T>(entity: Partial<DynaRecord>, key: PropertyKey) => key is keyof T;
 /**
  * Break an array into chunks
  * @param array
@@ -43,7 +43,7 @@ export declare const chunkArray: <T>(array: T[], size: number) => T[][];
  * @param value - The value to check. This can be any type as the function is meant to validate if it's a string.
  * @returns `true` if `value` is a string; otherwise, `false`.
  */
-export declare const isString: (value: any) => value is string;
+export declare const isString: (value: unknown) => value is string;
 /**
  * Safely assigns a value to a property of an object.
  * It's useful for dynamically assigning properties to objects where the property names might be known but the types could vary.
@@ -62,7 +62,7 @@ export declare const isString: (value: any) => value is string;
  * let entity = { id: "123" };
  * safeAssign(entity, "name", "Jane Doe");
  */
-export declare const safeAssign: <TObject extends EntityAttributesOnly<DynaRecord>, TKey extends keyof TObject, TValue>(object: TObject, key: TKey, value: TValue) => void;
+export declare const safeAssign: <TObject extends EntityAttributesOnly<DynaRecord>>(object: TObject, key: keyof TObject, value: unknown) => void;
 /**
  * Type guard to check if a string is a Nullable<string>
  * @param val

package/dist/src/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEzD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEzD;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,UAAU,eACvC,UAAU,CAAC,cACZ,OAAO,CAAC,UAAU,CAAC,KAC9B,eAqBF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,UAAU,eACvC,UAAU,CAAC,aACb,eAAe,KACzB,CAuBF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,UAAU,eACpC,UAAU,CAAC,cACZ,oBAAoB,CAAC,CAAC,CAAC,KAClC,CAUF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,WAChB,UAAU,OACb,MAAM,KACV,GAAG,IAAI,MAAM,UAEf,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAI,CAAC,UACrB,OAAO,CAAC,UAAU,CAAC,OACtB,GAAG,KACP,GAAG,IAAI,MAAM,CAEf,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,MAAM,KAAG,CAAC,EAAE,EAI3D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,UAAW,GAAG,KAAG,KAAK,IAAI,MAE9C,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU,GACrB,OAAO,SAAS,oBAAoB,CAAC,UAAU,CAAC,EAChD,IAAI,SAAS,MAAM,OAAO,EAC1B,MAAM,UAEE,OAAO,OACV,IAAI,SACF,MAAM,KACZ,IAEF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,QAAS,OAAO,KAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,CAErE,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEzD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEzD;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,gBACf,UAAU,UAAU,cACrB,OAAO,CAAC,UAAU,CAAC,KAC9B,eAoBF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,UAAU,eACvC,UAAU,CAAC,aACb,eAAe,KACzB,CAsBF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,UAAU,eACpC,UAAU,CAAC,cACZ,oBAAoB,CAAC,CAAC,CAAC,KAClC,CAUF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,WAChB,UAAU,OACb,MAAM,KACV,GAAG,IAAI,MAAM,UAEf,CAAC;AAEF;;;;;GAKG;AAEH,eAAO,MAAM,aAAa,GAAI,CAAC,UACrB,OAAO,CAAC,UAAU,CAAC,OACtB,WAAW,KACf,GAAG,IAAI,MAAM,CAEf,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,MAAM,KAAG,CAAC,EAAE,EAI3D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,UAAW,OAAO,KAAG,KAAK,IAAI,MAElD,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU,GAAI,OAAO,SAAS,oBAAoB,CAAC,UAAU,CAAC,UACjE,OAAO,OACV,MAAM,OAAO,SACX,OAAO,KACb,IAEF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,QAAS,OAAO,KAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,CAErE,CAAC"}

package/dist/src/utils.js

@@ -13,15 +13,16 @@ const metadata_1 = __importDefault(require("./metadata"));
  */
 const entityToTableItem = (EntityClass, entityData) => {
     const attributesMeta = metadata_1.default.getEntityAttributes(EntityClass.name);
-    return Object.entries(entityData).reduce((acc, [key, val]) => {
-        const attrMeta = attributesMeta[key];
-        if (attrMeta !== undefined) {
+    return Object.entries(entityData).reduce((acc, [key, rawVal]) => {
+        if (key in attributesMeta) {
+            const attrMeta = attributesMeta[key];
             const { alias, serializers } = attrMeta;
-            // If the attribute has a custom serializer, serialize it
-            const value = serializers === undefined || val === null
-                ? val
-                : serializers.toTableAttribute(val);
-            acc[alias] = value;
+            const val = rawVal;
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- DynamoTableItem values are NativeAttributeValue (any) from AWS SDK
+            acc[alias] =
+                serializers === undefined || val === null
+                    ? val
+                    : serializers.toTableAttribute(val);
         }
         return acc;
     }, {});
@@ -37,14 +38,14 @@ const tableItemToEntity = (EntityClass, tableItem) => {
     const tableAttributes = metadata_1.default.getEntityTableAttributes(EntityClass.name);
     const entity = new EntityClass();
     Object.keys(tableItem).forEach(attrName => {
-        const attrMeta = tableAttributes[attrName];
-        if (attrMeta !== undefined) {
+        if (attrName in tableAttributes) {
+            const attrMeta = tableAttributes[attrName];
             const { name: entityKey, serializers } = attrMeta;
             if ((0, exports.isKeyOfEntity)(entity, entityKey)) {
                 const rawVal = tableItem[attrName];
                 const val = serializers?.toEntityAttribute === undefined
                     ? rawVal
-                    : serializers?.toEntityAttribute(rawVal);
+                    : serializers.toEntityAttribute(rawVal);
                 (0, exports.safeAssign)(entity, entityKey, val);
             }
         }
@@ -78,6 +79,7 @@ exports.isKeyOfEntity = isKeyOfEntity;
  * @param key
  * @returns
  */
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters -- Generic T needed for narrowing key to keyof T at call sites
 const isKeyOfObject = (entity, key) => {
     return key in entity;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dyna-record",
-  "version": "0.4.11",
+  "version": "0.5.1",
   "description": "Typescript Data Modeler and ORM for Dynamo",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,8 +11,8 @@
     "typecheck:tests": "tsc -p tsconfig.dev.json --noEmit",
     "test": "tsc -p tsconfig.dev.json --noEmit && jest",
     "test:watch": "jest --watch",
-    "eslint": "npx eslint . --ext .ts",
-    "eslint:fix": "npx eslint . --ext .ts --fix",
+    "eslint": "npx eslint .",
+    "eslint:fix": "npx eslint . --fix",
     "prettier": "npx prettier . --write",
     "docs": "npx typedoc"
   },
@@ -35,25 +35,23 @@
   },
   "devDependencies": {
     "@aws-sdk/types": "^3.502.0",
+    "@eslint/js": "^9.39.3",
     "@tsconfig/recommended": "^1.0.3",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.11.16",
     "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-config-standard-with-typescript": "^43.0.1",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-promise": "^6.1.1",
+    "@typescript-eslint/eslint-plugin": "^8.56.1",
+    "eslint": "^9.39.3",
+    "eslint-config-prettier": "^10.1.8",
+    "globals": "^16.5.0",
     "jest": "^29.7.0",
     "prettier": "^3.2.5",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "typedoc": "^0.27.6",
     "typedoc-plugin-missing-exports": "^3.1.0",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.2",
+    "typescript-eslint": "^8.56.1"
   },
   "engines": {
     "npm": ">=10.0.0",