@lowdefy/api 4.5.2 → 4.7.0

package/dist/context/createApiContext.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/context/createAuthorize.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -12,13 +12,14 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-*/ import { ServerError } from './errors.js';
+*/ import { ConfigError } from '@lowdefy/errors';
 function createAuthorize({ session }) {
     // Next-auth getSession provides a session object if the user is authenticated
     // else session will be null
     const authenticated = !!session;
     const roles = session?.user?.roles ?? [];
-    function authorize({ auth }) {
+    function authorize(config) {
+        const { auth } = config;
         if (auth.public === true) return true;
         if (auth.public === false) {
             if (auth.roles) {
@@ -26,7 +27,10 @@ function createAuthorize({ session }) {
             }
             return authenticated;
         }
-        throw new ServerError('Invalid auth configuration');
+        throw new ConfigError('auth.public must be true or false.', {
+            received: auth.public,
+            configKey: config['~k']
+        });
     }
     return authorize;
 }

package/dist/context/createEvaluateOperators.js

@@ -1,4 +1,18 @@
-import { ServerParser } from '@lowdefy/operators';
+/*
+  Copyright 2020-2026 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/ import { ServerParser } from '@lowdefy/operators';
 function createEvaluateOperators(context) {
     const { jsMap, operators, payload, secrets, state, steps, user } = context;
     const operatorsParser = new ServerParser({
@@ -17,7 +31,7 @@ function createEvaluateOperators(context) {
             location
         });
         if (errors.length > 0) {
-            throw new Error(errors[0]);
+            throw errors[0];
         }
         return output;
     }

package/dist/context/createReadConfigFile.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import path from 'path';
-import { cachedPromises } from '@lowdefy/helpers';
+import { cachedPromises, serializer } from '@lowdefy/helpers';
 import { getFileExtension, readFile } from '@lowdefy/node-utils';
 function createReadConfigFile({ buildDirectory, fileCache }) {
     async function readConfigFile(filePath) {
         const fileContent = await readFile(path.resolve(buildDirectory, filePath));
         if (getFileExtension(filePath) === 'json') {
-            return JSON.parse(fileContent);
+            return serializer.deserializeFromString(fileContent);
         }
         return fileContent;
     }

package/dist/index.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,9 +15,10 @@
 */ import callEndpoint from './routes/endpoints/callEndpoint.js';
 import callRequest from './routes/request/callRequest.js';
 import createApiContext from './context/createApiContext.js';
+import createSessionCallback from './routes/auth/callbacks/createSessionCallback.js';
 import getHomeAndMenus from './routes/rootConfig/getHomeAndMenus.js';
 import getNextAuthConfig from './routes/auth/getNextAuthConfig.js';
 import getPageConfig from './routes/page/getPageConfig.js';
 import getRootConfig from './routes/rootConfig/getRootConfig.js';
-import { ConfigurationError, RequestError, ServerError } from './context/errors.js';
-export { callEndpoint, callRequest, ConfigurationError, createApiContext, getHomeAndMenus, getNextAuthConfig, getPageConfig, getRootConfig, RequestError, ServerError };
+import logClientError from './routes/log/logClientError.js';
+export { callEndpoint, callRequest, createApiContext, createSessionCallback, getHomeAndMenus, getNextAuthConfig, getPageConfig, getRootConfig, logClientError };

package/dist/routes/auth/callbacks/addUserFieldsToSession.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/callbacks/addUserFieldsToToken.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/callbacks/createCallbackPlugins.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/callbacks/createCallbacks.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/callbacks/createJWTCallback.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/callbacks/createRedirectCallback.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/callbacks/createSessionCallback.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/callbacks/createSignInCallback.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/createAdapter.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/createLogger.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -12,23 +12,27 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-*/ function createLogger({ logger }) {
+*/ const authWarnings = {
+    NEXTAUTH_URL: 'NEXTAUTH_URL - Environment variable NEXTAUTH_URL is missing. Set it in your .env file. On Vercel, VERCEL_URL is used automatically.',
+    NO_SECRET: 'NO_SECRET - No `secret` configured. In development a temporary secret is generated, but production requires an explicit secret.',
+    DEBUG_ENABLED: 'DEBUG_ENABLED - NextAuth debug mode is enabled. This is meant for development only — remove it before deploying to production.',
+    EXPERIMENTAL_API: 'EXPERIMENTAL_API - An experimental NextAuth API is in use. It may change or be removed in a future version.'
+};
+function createLogger({ logger }) {
     return {
-        error: (code, metadata)=>logger.error({
-                code,
-                metadata,
-                event: 'auth_error'
-            }),
-        warn: (code, metadata)=>logger.warn({
-                code,
-                metadata,
-                event: 'auth_warning'
-            }),
-        debug: (code, metadata)=>logger.debug({
-                code,
-                metadata,
-                event: 'auth_debug'
-            })
+        error: (code, metadata)=>{
+            const error = metadata instanceof Error ? metadata : metadata?.error;
+            if (error) {
+                error.code = code;
+            }
+            logger.error(error);
+        },
+        warn: (code)=>{
+            logger.warn(authWarnings[code] ?? code);
+        },
+        debug: (code, metadata)=>{
+            logger.debug(metadata, code);
+        }
     };
 }
 export default createLogger;

package/dist/routes/auth/createProviders.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/events/createCreateUserEvent.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/events/createEventPlugins.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/events/createEvents.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/events/createLinkAccountEvent.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/events/createSessionEvent.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/events/createSignInEvent.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/events/createSignOutEvent.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/events/createUpdateUserEvent.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/auth/getNextAuthConfig.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ function getNextAuthConfig({ authJson, logger, plugins, secrets }) {
         location: 'auth'
     });
     if (operatorErrors.length > 0) {
-        throw new Error(operatorErrors[0]);
+        throw operatorErrors[0];
     }
     nextAuthConfig.adapter = createAdapter({
         authConfig,

package/dist/routes/endpoints/addStepResult.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/endpoints/authorizeApiEndpoint.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-*/ import { ConfigurationError } from '../../context/errors.js';
+*/ import { ConfigError } from '@lowdefy/errors';
 function authorizeApiEndpoint({ authorize, logger }, { endpointConfig }) {
     if (!authorize(endpointConfig)) {
         logger.debug({
@@ -20,7 +20,7 @@ function authorizeApiEndpoint({ authorize, logger }, { endpointConfig }) {
             authorized: false,
             auth_config: endpointConfig.auth
         });
-        throw new ConfigurationError(`API Endpoint "${endpointConfig.endpointId}" does not exist.`);
+        throw new ConfigError(`API Endpoint "${endpointConfig.endpointId}" does not exist.`);
     }
     logger.debug({
         event: 'debug_api_authorize',

package/dist/routes/endpoints/callEndpoint.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/endpoints/control/controlFor.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -12,18 +12,19 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-*/ import runRoutine from '../runRoutine.js';
+*/ import { ConfigError } from '@lowdefy/errors';
+import runRoutine from '../runRoutine.js';
 async function controlFor(context, routineContext, { control }) {
-    const { logger, evaluateOperators } = context;
+    const { endpointId, logger, evaluateOperators } = context;
     const { items } = routineContext;
     const itemName = control[':for'];
     if (!itemName) {
-        throw new Error('Invalid :for - missing variable name in :for.');
+        throw new Error(`Invalid :for in endpoint "${endpointId}" - missing variable name in :for.`);
     }
     const array = evaluateOperators({
         input: control[':in'],
         items,
-        location: 'controlFor'
+        location: control['~k'] ?? ':for'
     });
     logger.debug({
         event: 'debug_control_for',
@@ -31,10 +32,13 @@ async function controlFor(context, routineContext, { control }) {
         itemName
     });
     if (!Array.isArray(array)) {
-        throw new Error('Invalid :for - evaluated :in to non-array.');
+        throw new ConfigError(`Invalid :for in endpoint "${endpointId}" - :in must evaluate to an array.`, {
+            received: array,
+            configKey: control['~k']
+        });
     }
     if (!control[':do']) {
-        throw new Error('Invalid :for - missing :do.');
+        throw new Error(`Invalid :for in endpoint "${endpointId}" - missing :do.`);
     }
     for (const [index, item] of array.entries()){
         const updatedItems = {

package/dist/routes/endpoints/control/controlIf.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
   limitations under the License.
 */ import runRoutine from '../runRoutine.js';
 async function controlIf(context, routineContext, { control }) {
-    const { logger, evaluateOperators } = context;
+    const { endpointId, logger, evaluateOperators } = context;
     const { items } = routineContext;
     const evaluatedIf = evaluateOperators({
         input: control[':if'],
         items,
-        location: 'TODO:'
+        location: control['~k'] ?? ':if'
     });
     logger.debug({
         event: 'debug_control_if',
@@ -33,7 +33,7 @@ async function controlIf(context, routineContext, { control }) {
             event: 'debug_control_if_run_then'
         });
         if (!control[':then']) {
-            throw new Error('Invalid :if - missing :then.');
+            throw new Error(`Invalid :if in endpoint "${endpointId}" - missing :then.`);
         }
         return runRoutine(context, routineContext, {
             routine: control[':then']

package/dist/routes/endpoints/control/controlLog.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,27 +13,32 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { type } from '@lowdefy/helpers';
+import { ConfigError } from '@lowdefy/errors';
 async function controlLog(context, routineContext, { control }) {
-    const { logger, evaluateOperators } = context;
+    const { endpointId, logger, evaluateOperators } = context;
     const { items } = routineContext;
+    const location = control['~k'] ?? ':log';
     logger.debug({
         event: 'debug_control_log'
     });
     const log = evaluateOperators({
         input: control[':log'],
         items,
-        location: 'TODO:'
+        location
     });
     const logLevel = evaluateOperators({
         input: control[':level'],
         items,
-        location: 'TODO:'
+        location
     }) ?? 'info';
     if (!type.isString(logLevel)) {
-        throw new Error(`Unrecognised type for :level. Received ${logLevel}.`);
+        throw new ConfigError(`Invalid :log in endpoint "${endpointId}" - :level must be a string.`, {
+            received: logLevel,
+            configKey: control['~k']
+        });
     }
     if (!logger[logLevel]) {
-        throw new Error(`Invalid log level for :log. Received ${logLevel}.`);
+        throw new Error(`Invalid :log in endpoint "${endpointId}" - unrecognised log level. Received "${logLevel}".`);
     }
     logger[logLevel](log);
     return {

package/dist/routes/endpoints/control/controlParallel.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/endpoints/control/controlParallelFor.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -12,18 +12,19 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-*/ import runRoutine from '../runRoutine.js';
+*/ import { ConfigError } from '@lowdefy/errors';
+import runRoutine from '../runRoutine.js';
 async function controlParallelFor(context, routineContext, { control }) {
-    const { logger, evaluateOperators } = context;
+    const { endpointId, logger, evaluateOperators } = context;
     const { items } = routineContext;
     const itemName = control[':parallel_for'];
     if (!itemName) {
-        throw new Error('Invalid :parallel_for - missing variable name in :parallel_for.');
+        throw new Error(`Invalid :parallel_for in endpoint "${endpointId}" - missing variable name in :parallel_for.`);
     }
     const array = evaluateOperators({
         input: control[':in'],
         items,
-        location: 'controlParallelFor'
+        location: control['~k'] ?? ':parallel_for'
     });
     logger.debug({
         event: 'debug_control_parallel',
@@ -31,10 +32,13 @@ async function controlParallelFor(context, routineContext, { control }) {
         itemName
     });
     if (!Array.isArray(array)) {
-        throw new Error('Invalid :parallel_for - evaluated :in to non-array.');
+        throw new ConfigError(`Invalid :parallel_for in endpoint "${endpointId}" - :in must evaluate to an array.`, {
+            received: array,
+            configKey: control['~k']
+        });
     }
     if (!control[':do']) {
-        throw new Error('Invalid :parallel_for - missing :do.');
+        throw new Error(`Invalid :parallel_for in endpoint "${endpointId}" - missing :do.`);
     }
     const promises = array.map((item, index)=>{
         const updatedItems = {

package/dist/routes/endpoints/control/controlReject.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,15 +15,16 @@
 */ async function controlReject(context, routineContext, { control }) {
     const { evaluateOperators } = context;
     const { items } = routineContext;
+    const location = control['~k'] ?? ':reject';
     const message = evaluateOperators({
         input: control[':reject'],
         items,
-        location: 'TODO'
+        location
     });
     const cause = evaluateOperators({
         input: control[':cause'],
         items,
-        location: 'TODO'
+        location
     });
     const error = new Error(message, {
         cause

package/dist/routes/endpoints/control/controlReturn.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
     const response = evaluateOperators({
         input: control[':return'],
         items,
-        location: 'TODO'
+        location: control['~k'] ?? ':return'
     });
     context.logger.debug({
         event: 'debug_control_return',

package/dist/routes/endpoints/control/controlSetState.js

@@ -5,7 +5,7 @@ function controlSetState(context, routineContext, { control }) {
     const evaluatedSetState = evaluateOperators({
         input: control[':set_state'],
         items,
-        location: 'TODO:'
+        location: control['~k'] ?? ':set_state'
     });
     logger.debug({
         event: 'debug_control_set_state',

package/dist/routes/endpoints/control/controlSwitch.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2024 Lowdefy, Inc
+  Copyright 2020-2026 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
   limitations under the License.
 */ import runRoutine from '../runRoutine.js';
 async function controlSwitch(context, routineContext, { control }) {
-    const { logger, evaluateOperators } = context;
+    const { endpointId, logger, evaluateOperators } = context;
     const { items } = routineContext;
     const cases = control[':switch'];
     logger.debug({
@@ -24,7 +24,7 @@ async function controlSwitch(context, routineContext, { control }) {
         const evaluatedCase = evaluateOperators({
             input: caseObj[':case'],
             items,
-            location: 'TODO'
+            location: caseObj['~k'] ?? control['~k'] ?? ':switch'
         });
         logger.debug({
             event: 'debug_control_switch_case',
@@ -38,7 +38,7 @@ async function controlSwitch(context, routineContext, { control }) {
                 event: 'debug_control_switch_run_then'
             });
             if (!caseObj[':then']) {
-                throw new Error('Invalid switch :case - missing :then');
+                throw new Error(`Invalid :switch :case in endpoint "${endpointId}" - missing :then.`);
             }
             return runRoutine(context, routineContext, {
                 routine: caseObj[':then']