Merge branch 'master' into feat/replace-patternkey-patternvalue

# Conflicts:
#	packages/json_schemas/schemas/input.schema.json
#	test/utilities.client.test.ts

Author: mfori

CHANGELOG.md

@@ -8,17 +8,18 @@ See the changelogs of each package:
 
 package | version | changelog
 --------|---------|----------
-`@apify/consts` | 2.47.0 | [CHANGELOG](./packages/consts/CHANGELOG.md)
+`@apify/actor-memory-expression` | 0.1.3 | [CHANGELOG](./packages/actor-memory-expression/CHANGELOG.md)
+`@apify/consts` | 2.48.0 | [CHANGELOG](./packages/consts/CHANGELOG.md)
 `@apify/datastructures` | 2.0.3 | [CHANGELOG](./packages/datastructures/CHANGELOG.md)
 `@apify/dummy-package-for-testing` | 2.2.0 | [CHANGELOG](./packages/dummy/CHANGELOG.md)
 `@apify/git` | 2.1.4 | [CHANGELOG](./packages/git/CHANGELOG.md)
 `@apify/image_proxy_client` | 2.0.3 | [CHANGELOG](./packages/image_proxy_client/CHANGELOG.md)
-`@apify/input_schema` | 3.24.0 | [CHANGELOG](./packages/input_schema/CHANGELOG.md)
-`@apify/input_secrets` | 1.2.16 | [CHANGELOG](./packages/input_secrets/CHANGELOG.md)
-`@apify/json_schemas` | 0.8.0 | [CHANGELOG](./packages/json_schemas/CHANGELOG.md)
-`@apify/log` | 2.5.26 | [CHANGELOG](./packages/log/CHANGELOG.md)
-`@apify/markdown` | 3.0.40 | [CHANGELOG](./packages/markdown/CHANGELOG.md)
+`@apify/input_schema` | 3.25.2 | [CHANGELOG](./packages/input_schema/CHANGELOG.md)
+`@apify/input_secrets` | 1.2.18 | [CHANGELOG](./packages/input_secrets/CHANGELOG.md)
+`@apify/json_schemas` | 0.9.2 | [CHANGELOG](./packages/json_schemas/CHANGELOG.md)
+`@apify/log` | 2.5.28 | [CHANGELOG](./packages/log/CHANGELOG.md)
+`@apify/markdown` | 3.0.42 | [CHANGELOG](./packages/markdown/CHANGELOG.md)
 `@apify/payment_qr_codes` | 0.2.1 | [CHANGELOG](./packages/payment_qr_codes/CHANGELOG.md)
-`@apify/pseudo_url` | 2.0.67 | [CHANGELOG](./packages/pseudo_url/CHANGELOG.md)
+`@apify/pseudo_url` | 2.0.69 | [CHANGELOG](./packages/pseudo_url/CHANGELOG.md)
 `@apify/timeout` | 0.3.2 | [CHANGELOG](./packages/timeout/CHANGELOG.md)
-`@apify/utilities` | 2.23.2 | [CHANGELOG](./packages/utilities/CHANGELOG.md)
+`@apify/utilities` | 2.23.4 | [CHANGELOG](./packages/utilities/CHANGELOG.md)

package-lock.json

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.3](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-27)
+
+**Note:** Version bump only for package @apify/actor-memory-expression
+
+
+
+
+
+## [0.1.2](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-27)
+
+**Note:** Version bump only for package @apify/actor-memory-expression
+
+
+
+
+
+## [0.1.1](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-27)
+
+**Note:** Version bump only for package @apify/actor-memory-expression
+
+
+
+
+
 # 0.1.0 (2025-11-25)
 
 

packages/actor-memory-expression/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
     "name": "@apify/actor-memory-expression",
-    "version": "0.1.0",
+    "version": "0.1.3",
     "description": "Utility to evaluate dynamic memory expressions for Apify actors.",
     "main": "./dist/cjs/index.cjs",
     "module": "./dist/esm/index.mjs",
@@ -48,8 +48,8 @@
         "access": "public"
     },
     "dependencies": {
-        "@apify/consts": "^2.47.0",
-        "@apify/log": "^2.5.26",
+        "@apify/consts": "^2.48.0",
+        "@apify/log": "^2.5.28",
         "mathjs": "^15.1.0"
     }
 }

packages/actor-memory-expression/package.json

@@ -1 +1,2 @@
 export * from './memory_calculator';
+export * from './types';

packages/actor-memory-expression/src/index.ts

@@ -5,7 +5,6 @@ import {
     compileDependencies,
     create,
     divideDependencies,
-    type EvalFunction,
     evaluateDependencies,
     maxDependencies,
     minDependencies,
@@ -20,7 +19,7 @@ import {
 
 import { ACTOR_LIMITS } from '@apify/consts';
 
-import type { ActorRunOptions, CompilationCache, MemoryEvaluationContext } from './types.js';
+import type { ActorRunOptions, CompilationCache, CompilationResult, MemoryEvaluationContext } from './types.js';
 
 // In theory, users could create expressions longer than 1000 characters,
 // but in practice, it's unlikely anyone would need that much complexity.
@@ -176,9 +175,9 @@ const processTemplateVariables = (defaultMemoryMbytes: string): string => {
 *
 * @param expression The expression string to compile.
 * @param cache An optional cache to store/retrieve compiled expressions.
-* @returns The compiled EvalFunction.
+* @returns The compiled CompilationResult.
 */
-const getCompiledExpression = async (expression: string, cache: CompilationCache | undefined): Promise<EvalFunction> => {
+const getCompiledExpression = async (expression: string, cache: CompilationCache | undefined): Promise<CompilationResult> => {
     if (!cache) {
         return compile(expression);
     }

packages/actor-memory-expression/src/memory_calculator.ts

@@ -20,3 +20,5 @@ export type CompilationCache = {
     set: (expression: string, compilationResult: EvalFunction) => Promise<void>;
     size: () => Promise<number>;
 }
+
+export type CompilationResult = EvalFunction;

packages/actor-memory-expression/src/types.ts

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.48.0](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-27)
+
+
+### Features
+
+* **consts:** add `TIMING_OUT` Actor event ([#579](https://github.com/apify/apify-shared-js/issues/579)) ([a83c351](https://github.com/apify/apify-shared-js/commit/a83c351e3eb07419c9926003c21f6c6fc34ff9a9))
+
+
+
+
+
+## [2.47.1](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-27)
+
+**Note:** Version bump only for package @apify/consts
+
+
+
+
+
 # [2.47.0](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-10-20)
 
 

packages/consts/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
     "name": "@apify/consts",
-    "version": "2.47.0",
+    "version": "2.48.0",
     "description": "Tools and constants shared across Apify projects.",
     "main": "./dist/cjs/index.cjs",
     "module": "./dist/esm/index.mjs",

packages/consts/package.json

@@ -22,6 +22,7 @@ export const ACTOR_EVENT_NAMES = {
     MIGRATING: 'migrating',
     PERSIST_STATE: 'persistState',
     ABORTING: 'aborting',
+    TIMING_OUT: 'timingOut',
 } as const;
 
 /**
@@ -703,6 +704,6 @@ export const ACTOR_PERMISSION_LEVEL = {
      * For details refer to the Apify documentation.
      */
     LIMITED_PERMISSIONS: 'LIMITED_PERMISSIONS',
-};
+} as const;
 
 export type ACTOR_PERMISSION_LEVEL = ValueOf<typeof ACTOR_PERMISSION_LEVEL>;