@apify/actor-utils 0.1.8-beta.0 → 0.1.8

package/dist/src/gteam-internal/push-data.d.ts

@@ -1,8 +1,8 @@
 import type { ChargeResult } from 'apify';
 /**
- * Pushes to the default dataset, or a named dataset when `alias` is given,
- * converting a schema-validation failure into a {@link NonRetryableError}
- * instead of leaving it to be retried.
+ * Pushes to the default dataset, or a named dataset when `alias` is given.
+ * Items that fail dataset schema-validation are repaired where possible and
+ * dropped (with a logged error) otherwise, instead of failing the whole push.
  *
  * @param data - A single item or array of items to push.
  * @param options.alias - Alias of the dataset to push to, opened via {@link Actor.openDataset}.
@@ -21,9 +21,9 @@ export declare function safePushData<T extends object>(data: T | T[], options?:
 }): Promise<void>;
 /**
  * Pushes to the default dataset and atomically charges for `eventName`, via
- * {@link Actor.pushData}'s built-in pay-per-event support. Converts a
- * schema-validation failure into a {@link NonRetryableError} instead of
- * leaving it to be retried.
+ * {@link Actor.pushData}'s built-in pay-per-event support. Items that fail
+ * dataset schema-validation are repaired where possible and dropped (with a
+ * logged error) otherwise, instead of failing the whole push.
  *
  * @param data - A single item or array of items to push.
  * @param options.eventName - Pay-per-event event name to charge for this push.

package/dist/src/gteam-internal/push-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push-data.d.ts","sourceRoot":"","sources":["../../../src/gteam-internal/push-data.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAwB1C;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,YAAY,CAAC,CAAC,SAAS,MAAM,EAC/C,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,EACb,OAAO,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,KAAK,CAAA;CAAE,GAC/C,OAAO,CAAC,IAAI,CAAC,CAAC;AACjB;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,YAAY,CAAC,CAAC,SAAS,MAAM,EAC/C,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,EACb,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,GAC9C,OAAO,CAAC,YAAY,CAAC,CAAC"}
+{"version":3,"file":"push-data.d.ts","sourceRoot":"","sources":["../../../src/gteam-internal/push-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAgC1C;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,YAAY,CAAC,CAAC,SAAS,MAAM,EAC/C,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,EACb,OAAO,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,KAAK,CAAA;CAAE,GAC/C,OAAO,CAAC,IAAI,CAAC,CAAC;AACjB;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,YAAY,CAAC,CAAC,SAAS,MAAM,EAC/C,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,EACb,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,GAC9C,OAAO,CAAC,YAAY,CAAC,CAAC"}

package/dist/src/gteam-internal/push-data.js

@@ -1,40 +1,40 @@
-import { NonRetryableError } from '@crawlee/core';
 import { Actor, log } from 'apify';
-import { ApifyApiError } from 'apify-client';
+import { pushDataWithSchemaRepair } from '../push-data-with-schema-repair/index.js';
+// Actor.pushData(items, eventName)'s resolved value when every item got
+// dropped and the push itself never ran — mirrors what a charge-less push
+// would report, so callers checking `chargeableWithinLimit` don't crash on
+// a missing result.
+const NO_CHARGE_RESULT = {
+    eventChargeLimitReached: false,
+    chargedCount: 0,
+    chargeableWithinLimit: {},
+};
 /**
- * Wraps a push call, converting a dataset schema-validation failure into a
- * {@link NonRetryableError} instead of a retryable one — a schema mismatch
- * will never fix itself on retry, so retrying just burns compute.
+ * Wraps a push call, repairing or dropping items that fail dataset
+ * schema-validation instead of letting the whole batch fail. Every dropped
+ * item is logged, so existing log-based monitoring keeps working.
  */
-async function wrapPushData(pushDataFn) {
-    try {
-        return await pushDataFn();
-    }
-    catch (error) {
-        if (!(error instanceof ApifyApiError) || !Array.isArray(error.data?.invalidItems)) {
-            throw error;
-        }
-        const msg = 'Dataset validation failed';
-        for (const { validationErrors } of error.data.invalidItems) {
-            log.error(msg, { msg, error: `${error}`, validationErrors });
-        }
-        throw new NonRetryableError(msg);
+async function wrapPushData(data, pushFn) {
+    const msg = 'Dataset validation failed';
+    const { droppedItems, pushResult } = await pushDataWithSchemaRepair(pushFn, data);
+    for (const { errors } of droppedItems) {
+        log.error(msg, { msg, validationErrors: errors });
     }
+    return pushResult;
 }
 export async function safePushData(data, options) {
     const { alias, eventName } = options ?? {};
-    // Default dataset: Actor.pushData(data, eventName) already pushes and
+    // Default dataset: Actor.pushData(items, eventName) already pushes and
     // charges atomically, so delegate to it as-is instead of reimplementing charging.
     if (!alias) {
         if (eventName) {
-            return wrapPushData(async () => Actor.pushData(data, eventName));
+            const pushResult = await wrapPushData(data, async (items) => Actor.pushData(items, eventName));
+            return pushResult ?? NO_CHARGE_RESULT;
         }
-        return wrapPushData(async () => Actor.pushData(data));
+        return wrapPushData(data, async (items) => Actor.pushData(items));
     }
     // Named dataset: charging is handled by the caller — call Actor.charge() themselves after this push.
     const dataset = await Actor.openDataset({ alias });
-    return wrapPushData(async () => {
-        await dataset.pushData(data);
-    });
+    return wrapPushData(data, async (items) => dataset.pushData(items));
 }
 //# sourceMappingURL=push-data.js.map

package/dist/src/gteam-internal/push-data.js.map

@@ -1 +1 @@
-{"version":3,"file":"push-data.js","sourceRoot":"","sources":["../../../src/gteam-internal/push-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C;;;;GAIG;AACH,KAAK,UAAU,YAAY,CAAI,UAA4B;IACvD,IAAI,CAAC;QACD,OAAO,MAAM,UAAU,EAAE,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,CAAC,KAAK,YAAY,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,CAAC;YAChF,MAAM,KAAK,CAAC;QAChB,CAAC;QACD,MAAM,GAAG,GAAG,2BAA2B,CAAC;QACxC,KAAK,MAAM,EAAE,gBAAgB,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACzD,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;AACL,CAAC;AAyCD,MAAM,CAAC,KAAK,UAAU,YAAY,CAC9B,IAAa,EACb,OAAgD;IAEhD,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAE3C,sEAAsE;IACtE,kFAAkF;IAClF,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,IAAI,SAAS,EAAE,CAAC;YACZ,OAAO,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QACrE,CAAC;QACD,OAAO,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,qGAAqG;IACrG,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,WAAW,CAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACtD,OAAO,YAAY,CAAC,KAAK,IAAI,EAAE;QAC3B,MAAM,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"push-data.js","sourceRoot":"","sources":["../../../src/gteam-internal/push-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AAEpF,wEAAwE;AACxE,0EAA0E;AAC1E,2EAA2E;AAC3E,oBAAoB;AACpB,MAAM,gBAAgB,GAAiB;IACnC,uBAAuB,EAAE,KAAK;IAC9B,YAAY,EAAE,CAAC;IACf,qBAAqB,EAAE,EAAE;CAC5B,CAAC;AAEF;;;;GAIG;AACH,KAAK,UAAU,YAAY,CACvB,IAAa,EACb,MAAkC;IAElC,MAAM,GAAG,GAAG,2BAA2B,CAAC;IACxC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,MAAM,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClF,KAAK,MAAM,EAAE,MAAM,EAAE,IAAI,YAAY,EAAE,CAAC;QACpC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,UAAU,CAAC;AACtB,CAAC;AAyCD,MAAM,CAAC,KAAK,UAAU,YAAY,CAC9B,IAAa,EACb,OAAgD;IAEhD,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAE3C,uEAAuE;IACvE,kFAAkF;IAClF,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,IAAI,SAAS,EAAE,CAAC;YACZ,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;YAC/F,OAAO,UAAU,IAAI,gBAAgB,CAAC;QAC1C,CAAC;QACD,OAAO,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,qGAAqG;IACrG,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,WAAW,CAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACtD,OAAO,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;AACxE,CAAC"}

package/package.json

@@ -1,113 +1,108 @@
 {
-  "name": "@apify/actor-utils",
-  "version": "0.1.8-beta.0",
-  "type": "module",
-  "description": "Wrapper around Actor.pushData that survives dataset schema-validation failures by stripping offending fields and retrying. Callers pass the actual push function as pushFn.",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/apify/apify-actor-utils.git"
-  },
-  "engines": {
-    "node": ">=22.6.0"
-  },
-  "types": "./dist/index.d.ts",
-  "main": "./dist/index.js",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
+    "name": "@apify/actor-utils",
+    "version": "0.1.8",
+    "type": "module",
+    "description": "Wrapper around Actor.pushData that survives dataset schema-validation failures by stripping offending fields and retrying. Callers pass the actual push function as pushFn.",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/apify/apify-actor-utils.git"
     },
-    "./push-data-with-schema-repair": {
-      "types": "./dist/src/push-data-with-schema-repair/index.d.ts",
-      "default": "./dist/src/push-data-with-schema-repair/index.js"
+    "engines": {
+        "node": ">=22.6.0"
     },
-    "./qc-logger": {
-      "types": "./dist/src/qc-logger/index.d.ts",
-      "default": "./dist/src/qc-logger/index.js"
+    "types": "./dist/index.d.ts",
+    "main": "./dist/index.js",
+    "exports": {
+        ".": {
+            "types": "./dist/index.d.ts",
+            "default": "./dist/index.js"
+        },
+        "./push-data-with-schema-repair": {
+            "types": "./dist/src/push-data-with-schema-repair/index.d.ts",
+            "default": "./dist/src/push-data-with-schema-repair/index.js"
+        },
+        "./qc-logger": {
+            "types": "./dist/src/qc-logger/index.d.ts",
+            "default": "./dist/src/qc-logger/index.js"
+        },
+        "./type-utils": {
+            "types": "./dist/src/type-utils/index.d.ts",
+            "default": "./dist/src/type-utils/index.js"
+        },
+        "./gteam-internal": {
+            "types": "./dist/src/gteam-internal/index.d.ts",
+            "default": "./dist/src/gteam-internal/index.js"
+        }
     },
-    "./type-utils": {
-      "types": "./dist/src/type-utils/index.d.ts",
-      "default": "./dist/src/type-utils/index.js"
+    "files": [
+        "dist/index.js",
+        "dist/index.js.map",
+        "dist/index.d.ts",
+        "dist/index.d.ts.map",
+        "dist/src"
+    ],
+    "typesVersions": {
+        "*": {
+            "qc-logger": [
+                "dist/src/qc-logger/index.d.ts"
+            ],
+            "type-utils": [
+                "dist/src/type-utils/index.d.ts"
+            ],
+            "gteam-internal": [
+                "dist/src/gteam-internal/index.d.ts"
+            ]
+        }
     },
-    "./gteam-internal": {
-      "types": "./dist/src/gteam-internal/index.d.ts",
-      "default": "./dist/src/gteam-internal/index.js"
-    }
-  },
-  "files": [
-    "dist/index.js",
-    "dist/index.js.map",
-    "dist/index.d.ts",
-    "dist/index.d.ts.map",
-    "dist/src"
-  ],
-  "typesVersions": {
-    "*": {
-      "qc-logger": [
-        "dist/src/qc-logger/index.d.ts"
-      ],
-      "type-utils": [
-        "dist/src/type-utils/index.d.ts"
-      ],
-      "gteam-internal": [
-        "dist/src/gteam-internal/index.d.ts"
-      ]
-    }
-  },
-  "scripts": {
-    "build": "tsc",
-    "typecheck": "tsc --noEmit",
-    "lint": "eslint",
-    "lint:fix": "eslint --fix",
-    "format": "prettier --write .",
-    "format:check": "prettier --check .",
-    "test": "vitest run --coverage",
-    "check:pushdata": "node scripts/check-pushdata.mjs",
-    "check-unused": "knip",
-    "ci": "npm run typecheck && npm run lint && npm run format:check && npm run check:pushdata && npm test",
-    "probe": "node scripts/probe-errors.mjs",
-    "prepare": "husky .husky || true"
-  },
-  "lint-staged": {
-    "*.js": "eslint",
-    "*.ts": "eslint",
-    "*.mjs": "eslint"
-  },
-  "devDependencies": {
-    "@apify/eslint-config": "^1.2.0",
-    "@apify/tsconfig": "^0.1.2",
-    "@crawlee/core": "3.16.0",
-    "@types/node": "^25.9.1",
-    "@vitest/coverage-v8": "^4.0.18",
-    "apify": "3.7.2",
-    "apify-client": "^2.17.0",
-    "eslint": "^9.39.4",
-    "eslint-config-prettier": "^10.1.8",
-    "globals": "^17.7.0",
-    "husky": "^9.1.7",
-    "knip": "^5.88.1",
-    "lint-staged": "^15.5.2",
-    "prettier": "^3.9.4",
-    "typescript": "^6.0.3",
-    "typescript-eslint": "^8.62.1",
-    "vitest": "^4.0.18"
-  },
-  "license": "ISC",
-  "peerDependencies": {
-    "@apify/log": "^2",
-    "@crawlee/core": "^3",
-    "apify": "^3",
-    "apify-client": "^2"
-  },
-  "peerDependenciesMeta": {
-    "@crawlee/core": {
-      "optional": true
+    "scripts": {
+        "build": "tsc",
+        "typecheck": "tsc --noEmit",
+        "lint": "eslint",
+        "lint:fix": "eslint --fix",
+        "format": "prettier --write .",
+        "format:check": "prettier --check .",
+        "test": "vitest run --coverage",
+        "check:pushdata": "node scripts/check-pushdata.mjs",
+        "check-unused": "knip",
+        "ci": "npm run typecheck && npm run lint && npm run format:check && npm run check:pushdata && npm test",
+        "probe": "node scripts/probe-errors.mjs",
+        "prepare": "husky .husky || true"
+    },
+    "lint-staged": {
+        "*.js": "eslint",
+        "*.ts": "eslint",
+        "*.mjs": "eslint"
+    },
+    "devDependencies": {
+        "@apify/eslint-config": "^1.2.0",
+        "@apify/tsconfig": "^0.1.2",
+        "@types/node": "^25.9.1",
+        "@vitest/coverage-v8": "^4.0.18",
+        "apify": "3.7.2",
+        "apify-client": "^2.17.0",
+        "eslint": "^9.39.4",
+        "eslint-config-prettier": "^10.1.8",
+        "globals": "^17.7.0",
+        "husky": "^9.1.7",
+        "knip": "^5.88.1",
+        "lint-staged": "^15.5.2",
+        "prettier": "^3.9.4",
+        "typescript": "^6.0.3",
+        "typescript-eslint": "^8.62.1",
+        "vitest": "^4.0.18"
     },
-    "apify": {
-      "optional": true
+    "license": "ISC",
+    "peerDependencies": {
+        "@apify/log": "^2",
+        "apify": "^3",
+        "apify-client": "^2"
     },
-    "apify-client": {
-      "optional": true
+    "peerDependenciesMeta": {
+        "apify": {
+            "optional": true
+        },
+        "apify-client": {
+            "optional": true
+        }
     }
-  }
 }