@player-tools/typescript-expression-plugin 0.2.2--canary.20.519 → 0.4.0-next.2

package/dist/index.cjs.js

@@ -91,6 +91,47 @@ function convertExprToJSONNode(exprNode) {
   return jsoncParser.parseTree(JSON.stringify(val));
 }
 
+var __defProp$1 = Object.defineProperty;
+var __defProps$1 = Object.defineProperties;
+var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
+var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
+var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$1 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$1.call(b, prop))
+      __defNormalProp$1(a, prop, b[prop]);
+  if (__getOwnPropSymbols$1)
+    for (var prop of __getOwnPropSymbols$1(b)) {
+      if (__propIsEnum$1.call(b, prop))
+        __defNormalProp$1(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+const toFunction = xlrSdk.simpleTransformGenerator("ref", "Expressions", (exp) => {
+  if (!exp.genericArguments || exp.ref !== "ExpressionHandler") {
+    return exp;
+  }
+  const [args, returnType] = exp.genericArguments;
+  const parameters = (args.type === "tuple" ? args.elementTypes : []).map((elementType, index) => {
+    var _a, _b, _c, _d, _e, _f;
+    return {
+      name: (_c = (_b = (_a = elementType.name) != null ? _a : elementType.type.name) != null ? _b : elementType.type.title) != null ? _c : `arg_${index}`,
+      type: __spreadValues$1({
+        name: (_f = (_e = (_d = elementType.name) != null ? _d : elementType.type.name) != null ? _e : elementType.type.title) != null ? _f : `arg_${index}`
+      }, elementType.type),
+      optional: elementType.optional === true ? elementType.optional : void 0
+    };
+  });
+  return __spreadProps$1(__spreadValues$1({}, exp), {
+    type: "function",
+    parameters,
+    returnType
+  });
+});
+
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
@@ -110,66 +151,41 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-function reduceExpression(plugins) {
-  const expressions = new Map();
-  plugins.forEach((plugin) => {
-    var _a;
-    const { capabilities } = plugin;
-    const registeredExpressions = (_a = capabilities == null ? void 0 : capabilities.Expressions) != null ? _a : [];
-    registeredExpressions.forEach((exp) => {
-      var _a2;
-      if (exp.type !== "ref" || !exp.genericArguments) {
-        return;
-      }
-      const expName = exp.name;
-      const [args, returnType] = exp.genericArguments;
-      const parameters = (args.type === "tuple" ? args.elementTypes : []).map((elementType, index) => {
-        var _a3, _b, _c, _d, _e, _f;
-        return {
-          name: (_c = (_b = (_a3 = elementType.name) != null ? _a3 : elementType.type.name) != null ? _b : elementType.type.title) != null ? _c : `arg_${index}`,
-          type: __spreadValues({
-            name: (_f = (_e = (_d = elementType.name) != null ? _d : elementType.type.name) != null ? _e : elementType.type.title) != null ? _f : `arg_${index}`
-          }, elementType.type),
-          optional: elementType.optional === true ? elementType.optional : void 0
-        };
-      });
-      const entry = {
-        name: expName,
-        description: (_a2 = exp.description) != null ? _a2 : "",
-        source: plugin,
-        type: __spreadProps(__spreadValues({}, exp), {
-          type: "function",
-          parameters,
-          returnType
-        })
-      };
-      expressions.set(expName, entry);
-    });
-  });
-  const expList = {
-    entries: expressions
-  };
-  return expList;
-}
 class ExpressionLanguageService {
   constructor(options) {
     this._plugins = [];
     var _a;
     this.logger = options == null ? void 0 : options.logger;
     this._plugins = (_a = options == null ? void 0 : options.plugins) != null ? _a : [];
-    this._expressions = reduceExpression(this._plugins);
     this.xlr = new xlrSdk.XLRSDK();
     this._plugins.forEach((p) => {
-      this.xlr.loadDefinitionsFromModule(p);
+      this.xlr.loadDefinitionsFromModule(p, void 0, [toFunction]);
     });
+    this._expressions = this.reduceExpression();
   }
   setConfig(config) {
     this._plugins = config.plugins;
-    this._expressions = reduceExpression(this._plugins);
     this.xlr = new xlrSdk.XLRSDK();
     this._plugins.forEach((p) => {
-      this.xlr.loadDefinitionsFromModule(p);
+      this.xlr.loadDefinitionsFromModule(p, void 0, [toFunction]);
+    });
+    this._expressions = this.reduceExpression();
+  }
+  reduceExpression() {
+    const expressions = new Map();
+    this.xlr.listTypes().forEach((type) => {
+      const typeInfo = this.xlr.getTypeInfo(type.name);
+      const source = this._plugins.find((value) => value.pluginName === (typeInfo == null ? void 0 : typeInfo.plugin));
+      if (type.type === "function" && (typeInfo == null ? void 0 : typeInfo.capability) === "Expressions" && source) {
+        expressions.set(type.name, {
+          name: type.name,
+          description: type.description,
+          type,
+          source
+        });
+      }
     });
+    return expressions;
   }
   getCompletionsAtPosition(context, position) {
     var _a, _b;
@@ -180,7 +196,7 @@ class ExpressionLanguageService {
       entries: []
     };
     if (context.text.length === 0) {
-      this._expressions.entries.forEach((exp) => {
+      this._expressions.forEach((exp) => {
         completionInfo.entries.push({
           name: exp.name,
           kind: ts__namespace.ScriptElementKind.functionElement,
@@ -195,7 +211,7 @@ class ExpressionLanguageService {
     const parsed = player.parseExpression(line, { strict: false });
     const token = getTokenAtPosition(parsed, position);
     if ((token == null ? void 0 : token.type) === "Compound" && token.error) {
-      this._expressions.entries.forEach((exp) => {
+      this._expressions.forEach((exp) => {
         completionInfo.entries.push({
           name: exp.name,
           kind: ts__namespace.ScriptElementKind.functionElement,
@@ -209,7 +225,7 @@ class ExpressionLanguageService {
     if ((token == null ? void 0 : token.type) === "Identifier") {
       const start = (_b = (_a = token.location) == null ? void 0 : _a.start) != null ? _b : { character: 0 };
       const wordFromStart = line.slice(start.character, position.character);
-      const allCompletions = Array.from(this._expressions.entries.keys()).filter((key) => key.startsWith(wordFromStart));
+      const allCompletions = Array.from(this._expressions.keys()).filter((key) => key.startsWith(wordFromStart));
       allCompletions.forEach((c) => {
         completionInfo.entries.push({
           name: c,
@@ -224,7 +240,7 @@ class ExpressionLanguageService {
   }
   getCompletionEntryDetails(context, position, name) {
     var _a;
-    const expression = this._expressions.entries.get(name);
+    const expression = this._expressions.get(name);
     const completionDetails = {
       name,
       kind: ts__namespace.ScriptElementKind.functionElement,
@@ -243,7 +259,7 @@ class ExpressionLanguageService {
     const parsed = player.parseExpression(context.text, { strict: false });
     const token = getTokenAtPosition(parsed, position);
     if ((token == null ? void 0 : token.type) === "Identifier") {
-      const expression = this._expressions.entries.get(token.name);
+      const expression = this._expressions.get(token.name);
       if (expression) {
         const completionDetails = this.getCompletionEntryDetails(context, position, expression.name);
         return __spreadProps(__spreadValues({}, completionDetails), {
@@ -279,7 +295,7 @@ class ExpressionLanguageService {
     }
     if (node.type === "CallExpression") {
       const exprName = node.callTarget.name;
-      const expression = this._expressions.entries.get(exprName);
+      const expression = this._expressions.get(exprName);
       node.args.forEach((n) => {
         diags.push(...this.getDiagnosticsForNode(context, n));
       });

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 import { decorateWithTemplateLanguageService } from 'typescript-template-language-service-decorator';
 import * as ts from 'typescript/lib/tsserverlibrary';
 import { createTSDocString } from '@player-tools/xlr-utils';
-import { XLRSDK } from '@player-tools/xlr-sdk';
+import { simpleTransformGenerator, XLRSDK } from '@player-tools/xlr-sdk';
 import { parseExpression } from '@player-ui/player';
 import { parseTree } from 'jsonc-parser';
 
@@ -69,6 +69,47 @@ function convertExprToJSONNode(exprNode) {
   return parseTree(JSON.stringify(val));
 }
 
+var __defProp$1 = Object.defineProperty;
+var __defProps$1 = Object.defineProperties;
+var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
+var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
+var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$1 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$1.call(b, prop))
+      __defNormalProp$1(a, prop, b[prop]);
+  if (__getOwnPropSymbols$1)
+    for (var prop of __getOwnPropSymbols$1(b)) {
+      if (__propIsEnum$1.call(b, prop))
+        __defNormalProp$1(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+const toFunction = simpleTransformGenerator("ref", "Expressions", (exp) => {
+  if (!exp.genericArguments || exp.ref !== "ExpressionHandler") {
+    return exp;
+  }
+  const [args, returnType] = exp.genericArguments;
+  const parameters = (args.type === "tuple" ? args.elementTypes : []).map((elementType, index) => {
+    var _a, _b, _c, _d, _e, _f;
+    return {
+      name: (_c = (_b = (_a = elementType.name) != null ? _a : elementType.type.name) != null ? _b : elementType.type.title) != null ? _c : `arg_${index}`,
+      type: __spreadValues$1({
+        name: (_f = (_e = (_d = elementType.name) != null ? _d : elementType.type.name) != null ? _e : elementType.type.title) != null ? _f : `arg_${index}`
+      }, elementType.type),
+      optional: elementType.optional === true ? elementType.optional : void 0
+    };
+  });
+  return __spreadProps$1(__spreadValues$1({}, exp), {
+    type: "function",
+    parameters,
+    returnType
+  });
+});
+
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
@@ -88,66 +129,41 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-function reduceExpression(plugins) {
-  const expressions = new Map();
-  plugins.forEach((plugin) => {
-    var _a;
-    const { capabilities } = plugin;
-    const registeredExpressions = (_a = capabilities == null ? void 0 : capabilities.Expressions) != null ? _a : [];
-    registeredExpressions.forEach((exp) => {
-      var _a2;
-      if (exp.type !== "ref" || !exp.genericArguments) {
-        return;
-      }
-      const expName = exp.name;
-      const [args, returnType] = exp.genericArguments;
-      const parameters = (args.type === "tuple" ? args.elementTypes : []).map((elementType, index) => {
-        var _a3, _b, _c, _d, _e, _f;
-        return {
-          name: (_c = (_b = (_a3 = elementType.name) != null ? _a3 : elementType.type.name) != null ? _b : elementType.type.title) != null ? _c : `arg_${index}`,
-          type: __spreadValues({
-            name: (_f = (_e = (_d = elementType.name) != null ? _d : elementType.type.name) != null ? _e : elementType.type.title) != null ? _f : `arg_${index}`
-          }, elementType.type),
-          optional: elementType.optional === true ? elementType.optional : void 0
-        };
-      });
-      const entry = {
-        name: expName,
-        description: (_a2 = exp.description) != null ? _a2 : "",
-        source: plugin,
-        type: __spreadProps(__spreadValues({}, exp), {
-          type: "function",
-          parameters,
-          returnType
-        })
-      };
-      expressions.set(expName, entry);
-    });
-  });
-  const expList = {
-    entries: expressions
-  };
-  return expList;
-}
 class ExpressionLanguageService {
   constructor(options) {
     this._plugins = [];
     var _a;
     this.logger = options == null ? void 0 : options.logger;
     this._plugins = (_a = options == null ? void 0 : options.plugins) != null ? _a : [];
-    this._expressions = reduceExpression(this._plugins);
     this.xlr = new XLRSDK();
     this._plugins.forEach((p) => {
-      this.xlr.loadDefinitionsFromModule(p);
+      this.xlr.loadDefinitionsFromModule(p, void 0, [toFunction]);
     });
+    this._expressions = this.reduceExpression();
   }
   setConfig(config) {
     this._plugins = config.plugins;
-    this._expressions = reduceExpression(this._plugins);
     this.xlr = new XLRSDK();
     this._plugins.forEach((p) => {
-      this.xlr.loadDefinitionsFromModule(p);
+      this.xlr.loadDefinitionsFromModule(p, void 0, [toFunction]);
+    });
+    this._expressions = this.reduceExpression();
+  }
+  reduceExpression() {
+    const expressions = new Map();
+    this.xlr.listTypes().forEach((type) => {
+      const typeInfo = this.xlr.getTypeInfo(type.name);
+      const source = this._plugins.find((value) => value.pluginName === (typeInfo == null ? void 0 : typeInfo.plugin));
+      if (type.type === "function" && (typeInfo == null ? void 0 : typeInfo.capability) === "Expressions" && source) {
+        expressions.set(type.name, {
+          name: type.name,
+          description: type.description,
+          type,
+          source
+        });
+      }
     });
+    return expressions;
   }
   getCompletionsAtPosition(context, position) {
     var _a, _b;
@@ -158,7 +174,7 @@ class ExpressionLanguageService {
       entries: []
     };
     if (context.text.length === 0) {
-      this._expressions.entries.forEach((exp) => {
+      this._expressions.forEach((exp) => {
         completionInfo.entries.push({
           name: exp.name,
           kind: ts.ScriptElementKind.functionElement,
@@ -173,7 +189,7 @@ class ExpressionLanguageService {
     const parsed = parseExpression(line, { strict: false });
     const token = getTokenAtPosition(parsed, position);
     if ((token == null ? void 0 : token.type) === "Compound" && token.error) {
-      this._expressions.entries.forEach((exp) => {
+      this._expressions.forEach((exp) => {
         completionInfo.entries.push({
           name: exp.name,
           kind: ts.ScriptElementKind.functionElement,
@@ -187,7 +203,7 @@ class ExpressionLanguageService {
     if ((token == null ? void 0 : token.type) === "Identifier") {
       const start = (_b = (_a = token.location) == null ? void 0 : _a.start) != null ? _b : { character: 0 };
       const wordFromStart = line.slice(start.character, position.character);
-      const allCompletions = Array.from(this._expressions.entries.keys()).filter((key) => key.startsWith(wordFromStart));
+      const allCompletions = Array.from(this._expressions.keys()).filter((key) => key.startsWith(wordFromStart));
       allCompletions.forEach((c) => {
         completionInfo.entries.push({
           name: c,
@@ -202,7 +218,7 @@ class ExpressionLanguageService {
   }
   getCompletionEntryDetails(context, position, name) {
     var _a;
-    const expression = this._expressions.entries.get(name);
+    const expression = this._expressions.get(name);
     const completionDetails = {
       name,
       kind: ts.ScriptElementKind.functionElement,
@@ -221,7 +237,7 @@ class ExpressionLanguageService {
     const parsed = parseExpression(context.text, { strict: false });
     const token = getTokenAtPosition(parsed, position);
     if ((token == null ? void 0 : token.type) === "Identifier") {
-      const expression = this._expressions.entries.get(token.name);
+      const expression = this._expressions.get(token.name);
       if (expression) {
         const completionDetails = this.getCompletionEntryDetails(context, position, expression.name);
         return __spreadProps(__spreadValues({}, completionDetails), {
@@ -257,7 +273,7 @@ class ExpressionLanguageService {
     }
     if (node.type === "CallExpression") {
       const exprName = node.callTarget.name;
-      const expression = this._expressions.entries.get(exprName);
+      const expression = this._expressions.get(exprName);
       node.args.forEach((n) => {
         diags.push(...this.getDiagnosticsForNode(context, n));
       });

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@player-tools/typescript-expression-plugin",
-  "version": "0.2.2--canary.20.519",
+  "version": "0.4.0-next.2",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "peerDependencies": {},
   "dependencies": {
-    "@player-tools/xlr": "0.2.2--canary.20.519",
-    "@player-tools/xlr-sdk": "0.2.2--canary.20.519",
-    "@player-tools/xlr-utils": "0.2.2--canary.20.519",
-    "@player-ui/player": "0.3.1--canary.117.4130",
+    "@player-tools/xlr": "0.4.0-next.2",
+    "@player-tools/xlr-sdk": "0.4.0-next.2",
+    "@player-tools/xlr-utils": "0.4.0-next.2",
+    "@player-ui/player": "0.4.0-next.7",
     "jsonc-parser": "^2.3.1",
     "typescript-template-language-service-decorator": "^2.3.1",
     "@babel/runtime": "7.15.4"

package/src/service.ts

@@ -4,12 +4,7 @@ import type {
   TemplateContext,
   Logger,
 } from 'typescript-template-language-service-decorator';
-import type {
-  FunctionType,
-  TSManifest,
-  FunctionTypeParameters,
-  NodeType,
-} from '@player-tools/xlr';
+import type { FunctionType, TSManifest, NodeType } from '@player-tools/xlr';
 import { createTSDocString } from '@player-tools/xlr-utils';
 import { XLRSDK } from '@player-tools/xlr-sdk';
 import type { ExpressionNode } from '@player-ui/player';
@@ -19,90 +14,41 @@ import {
   toTSLocation,
   convertExprToJSONNode,
 } from './utils';
+import { toFunction } from './transforms';
 
-interface ExpEntry {
+interface ExpressionEntry {
+  /**
+   * The name of the expression
+   */
   name: string;
-  description: string;
+  /**
+   * The description of the expression
+   */
+  description?: string;
+  /**
+   * The XLR type of the expression
+   */
   type: FunctionType;
+  /**
+   * The XLR enabled plugin the expression was sourced from
+   */
   source: TSManifest;
 }
 
-interface ExpressionList {
-  entries: Map<string, ExpEntry>;
-}
-
 export interface ExpressionLanguageServiceConfig {
+  /**
+   * The list of XLR enabled plugins to load
+   */
   plugins: Array<TSManifest>;
 }
 
-// TODO: This should move into the xlr/cli package so expressions are converted to functions at build time
-function reduceExpression(plugins: Array<TSManifest>): ExpressionList {
-  // Overlaps in names will be resolved by the last plugin to be loaded
-  // So use a map to ensure no duplicates
-  const expressions = new Map<string, ExpEntry>();
-
-  plugins.forEach((plugin) => {
-    const { capabilities } = plugin;
-    const registeredExpressions = capabilities?.Expressions ?? [];
-
-    registeredExpressions.forEach((exp) => {
-      if (exp.type !== 'ref' || !exp.genericArguments) {
-        return;
-      }
-
-      const expName = exp.name;
-      const [args, returnType] = exp.genericArguments;
-
-      const parameters: Array<FunctionTypeParameters> = (
-        args.type === 'tuple' ? args.elementTypes : []
-      ).map((elementType, index) => {
-        return {
-          name:
-            elementType.name ??
-            elementType.type.name ??
-            elementType.type.title ??
-            `arg_${index}`,
-
-          type: {
-            name:
-              elementType.name ??
-              elementType.type.name ??
-              elementType.type.title ??
-              `arg_${index}`,
-            ...elementType.type,
-          },
-          optional:
-            elementType.optional === true ? elementType.optional : undefined,
-        };
-      });
-
-      const entry: ExpEntry = {
-        name: expName,
-        description: exp.description ?? '',
-        source: plugin,
-        type: {
-          ...exp,
-          type: 'function',
-          parameters,
-          returnType,
-        },
-      };
-
-      expressions.set(expName, entry);
-    });
-  });
-
-  const expList: ExpressionList = {
-    entries: expressions,
-  };
-
-  return expList;
-}
-
+/**
+ * Language server to check Player expression syntax and usage
+ */
 export class ExpressionLanguageService implements TemplateLanguageService {
   private logger?: Logger;
   private _plugins: Array<TSManifest> = [];
-  private _expressions: ExpressionList;
+  private _expressions: Map<string, ExpressionEntry>;
   private xlr: XLRSDK;
 
   constructor(
@@ -110,22 +56,50 @@ export class ExpressionLanguageService implements TemplateLanguageService {
   ) {
     this.logger = options?.logger;
     this._plugins = options?.plugins ?? [];
-    this._expressions = reduceExpression(this._plugins);
     this.xlr = new XLRSDK();
 
     this._plugins.forEach((p) => {
-      this.xlr.loadDefinitionsFromModule(p);
+      this.xlr.loadDefinitionsFromModule(p, undefined, [toFunction]);
     });
+    this._expressions = this.reduceExpression();
   }
 
   setConfig(config: ExpressionLanguageServiceConfig) {
     this._plugins = config.plugins;
-    this._expressions = reduceExpression(this._plugins);
     this.xlr = new XLRSDK();
 
     this._plugins.forEach((p) => {
-      this.xlr.loadDefinitionsFromModule(p);
+      this.xlr.loadDefinitionsFromModule(p, undefined, [toFunction]);
     });
+    this._expressions = this.reduceExpression();
+  }
+
+  private reduceExpression(): Map<string, ExpressionEntry> {
+    // Overlaps in names will be resolved by the last plugin to be loaded
+    // So use a map to ensure no duplicates
+    const expressions = new Map<string, ExpressionEntry>();
+
+    this.xlr.listTypes().forEach((type) => {
+      const typeInfo = this.xlr.getTypeInfo(type.name);
+      const source = this._plugins.find(
+        (value) => value.pluginName === typeInfo?.plugin
+      );
+
+      if (
+        type.type === 'function' &&
+        typeInfo?.capability === 'Expressions' &&
+        source
+      ) {
+        expressions.set(type.name, {
+          name: type.name,
+          description: type.description,
+          type: type as FunctionType,
+          source,
+        });
+      }
+    });
+
+    return expressions;
   }
 
   getCompletionsAtPosition(
@@ -143,7 +117,7 @@ export class ExpressionLanguageService implements TemplateLanguageService {
       // This happens for the start of an expression (e``)
       // Provide all the completions in this case
 
-      this._expressions.entries.forEach((exp) => {
+      this._expressions.forEach((exp) => {
         completionInfo.entries.push({
           name: exp.name,
           kind: ts.ScriptElementKind.functionElement,
@@ -163,7 +137,7 @@ export class ExpressionLanguageService implements TemplateLanguageService {
     if (token?.type === 'Compound' && token.error) {
       // We hit the end of the expression, and it's expecting more
       // so provide all the completions
-      this._expressions.entries.forEach((exp) => {
+      this._expressions.forEach((exp) => {
         completionInfo.entries.push({
           name: exp.name,
           kind: ts.ScriptElementKind.functionElement,
@@ -180,9 +154,9 @@ export class ExpressionLanguageService implements TemplateLanguageService {
       // get the relevant start of the identifier
       const start = token.location?.start ?? { character: 0 };
       const wordFromStart = line.slice(start.character, position.character);
-      const allCompletions = Array.from(
-        this._expressions.entries.keys()
-      ).filter((key) => key.startsWith(wordFromStart));
+      const allCompletions = Array.from(this._expressions.keys()).filter(
+        (key) => key.startsWith(wordFromStart)
+      );
 
       allCompletions.forEach((c) => {
         completionInfo.entries.push({
@@ -203,7 +177,7 @@ export class ExpressionLanguageService implements TemplateLanguageService {
     position: ts.LineAndCharacter,
     name: string
   ): ts.CompletionEntryDetails {
-    const expression = this._expressions.entries.get(name);
+    const expression = this._expressions.get(name);
 
     const completionDetails: ts.CompletionEntryDetails = {
       name,
@@ -230,7 +204,7 @@ export class ExpressionLanguageService implements TemplateLanguageService {
     const token = getTokenAtPosition(parsed, position);
 
     if (token?.type === 'Identifier') {
-      const expression = this._expressions.entries.get(token.name);
+      const expression = this._expressions.get(token.name);
 
       if (expression) {
         const completionDetails = this.getCompletionEntryDetails(
@@ -289,7 +263,7 @@ export class ExpressionLanguageService implements TemplateLanguageService {
     if (node.type === 'CallExpression') {
       // Check that the expression is valid
       const exprName = node.callTarget.name;
-      const expression = this._expressions.entries.get(exprName);
+      const expression = this._expressions.get(exprName);
 
       node.args.forEach((n) => {
         diags.push(...this.getDiagnosticsForNode(context, n));

package/src/transforms.ts

@@ -0,0 +1,44 @@
+import type { FunctionType, FunctionTypeParameters } from '@player-tools/xlr';
+import { simpleTransformGenerator } from '@player-tools/xlr-sdk';
+
+export const toFunction = simpleTransformGenerator(
+  'ref',
+  'Expressions',
+  (exp) => {
+    if (!exp.genericArguments || exp.ref !== 'ExpressionHandler') {
+      return exp;
+    }
+
+    const [args, returnType] = exp.genericArguments;
+
+    const parameters: Array<FunctionTypeParameters> = (
+      args.type === 'tuple' ? args.elementTypes : []
+    ).map((elementType, index) => {
+      return {
+        name:
+          elementType.name ??
+          elementType.type.name ??
+          elementType.type.title ??
+          `arg_${index}`,
+
+        type: {
+          name:
+            elementType.name ??
+            elementType.type.name ??
+            elementType.type.title ??
+            `arg_${index}`,
+          ...elementType.type,
+        },
+        optional:
+          elementType.optional === true ? elementType.optional : undefined,
+      };
+    });
+
+    return {
+      ...exp,
+      type: 'function',
+      parameters,
+      returnType,
+    } as FunctionType as any;
+  }
+);