@player-tools/json-language-service 0.4.2--canary.69.1573 → 0.4.2-next.1

package/dist/index.cjs.js

@@ -1863,48 +1863,41 @@ var __spreadValues$1 = (a, b) => {
   return a;
 };
 var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
-const applyCommonProps = (inputNode, capability) => {
-  const outputNode = __spreadValues$1({}, inputNode);
-  if (capability === "Assets") {
-    if (outputNode.type === "object") {
-      if (!outputNode.properties.applicability) {
-        outputNode.properties.applicability = {
-          required: false,
-          node: {
-            type: "or",
-            name: "Applicability",
-            description: "Evaluate the given expression (or boolean) and if falsy, remove this node from the tree. This is re-computed for each change in the data-model",
-            or: [
-              {
-                type: "boolean"
-              },
-              {
-                type: "ref",
-                ref: "Expression"
-              }
-            ]
-          }
-        };
-      }
+const applyCommonProps = (node, capability) => {
+  return xlrSdk.simpleTransformGenerator("object", ["Assets", "Views"], (xlrNode) => {
+    if (!xlrNode.properties.applicability) {
+      xlrNode.properties.applicability = {
+        required: false,
+        node: {
+          type: "or",
+          name: "Applicability",
+          description: "Evaluate the given expression (or boolean) and if falsy, remove this node from the tree. This is re-computed for each change in the data-model",
+          or: [
+            {
+              type: "boolean"
+            },
+            {
+              type: "ref",
+              ref: "Expression"
+            }
+          ]
+        }
+      };
     }
-  }
-  if (outputNode.type === "object" && !outputNode.properties._comment) {
-    outputNode.properties._comment = {
-      required: false,
-      node: {
-        description: "Adds a comment for the given node",
-        type: "string"
-      }
-    };
-  } else if (outputNode.type === "and") {
-    outputNode.and.map((n) => applyCommonProps(n, capability));
-  } else if (outputNode.type === "or") {
-    outputNode.or.map((n) => applyCommonProps(n, capability));
-  }
-  return outputNode;
+    if (!xlrNode.properties._comment) {
+      xlrNode.properties._comment = {
+        required: false,
+        node: {
+          description: "Adds a comment for the given node",
+          type: "string"
+        }
+      };
+    }
+    return xlrNode;
+  })(node, capability);
 };
 const applyAssetWrapperOrSwitch = (node, capability) => {
-  return xlrSdk.simpleTransformGenerator("ref", "Assets", (xlrNode) => {
+  return xlrSdk.simpleTransformGenerator("ref", ["Assets", "Views"], (xlrNode) => {
     if (xlrNode.ref.includes("AssetWrapper")) {
       return __spreadProps$1(__spreadValues$1({}, xlrNode), {
         ref: xlrNode.ref.replace("AssetWrapper", "AssetWrapperOrSwitch")
@@ -1953,8 +1946,8 @@ const applyValueRefs = (node, capability) => {
   })(node, capability);
 };
 const applyTemplateProperty = (node, capability) => {
-  const templateTypes = [];
-  return xlrSdk.simpleTransformGenerator("object", "Assets", (inputNode) => {
+  return xlrSdk.simpleTransformGenerator("object", ["Assets", "Views"], (inputNode) => {
+    const templateTypes = [];
     const xlrNode = __spreadValues$1({}, inputNode);
     for (const key in xlrNode.properties) {
       const value = xlrNode.properties[key];
@@ -2449,6 +2442,12 @@ class PlayerLanguageService {
       return this.hooks.definition.call(context);
     });
   }
+  addXLRTransforms(transforms) {
+    Object.entries(transforms).forEach(([name, fn]) => this.XLRService.XLRSDK.addTransformFunction(name, fn));
+  }
+  addLSPPlugin(plugin) {
+    plugin.apply(this);
+  }
   setAssetTypes(typeFiles) {
     return __async(this, null, function* () {
       typeFiles.forEach((file) => {

package/dist/index.d.ts

@@ -1,10 +1,10 @@
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { SyncHook, AsyncParallelHook, SyncWaterfallHook, SyncBailHook } from 'tapable-ts';
 import { Diagnostic, Range, TextEdit, Position, DiagnosticSeverity, CompletionItem, Location, Hover, FormattingOptions, CompletionList, CodeActionContext, CodeAction } from 'vscode-languageserver-types';
-import { Node } from 'jsonc-parser';
-import { BasicXLRRegistry, Filters, TypeMetadata, XLRSDK } from '@player-tools/xlr-sdk';
 import * as _player_tools_xlr from '@player-tools/xlr';
 import { NamedType, NodeType, ObjectType, TransformFunction } from '@player-tools/xlr';
+import { Node } from 'jsonc-parser';
+import { BasicXLRRegistry, Filters, TypeMetadata, XLRSDK } from '@player-tools/xlr-sdk';
 
 declare type ASTNode = StringASTNode | NumberASTNode | BooleanASTNode | ArrayASTNode | NullASTNode | PropertyASTNode | ObjectASTNode | AssetASTNode | ViewASTNode | ContentASTNode | NavigationASTNode | FlowASTNode | EmptyASTNode | FlowStateASTNode;
 interface BaseASTNode<T extends string> {
@@ -443,6 +443,8 @@ declare class PlayerLanguageService {
     getHoverInfoAtPosition(document: TextDocument, position: Position): Promise<Hover | undefined | null>;
     getCodeActionsInRange(document: TextDocument, context: CodeActionContext): Promise<CodeAction[]>;
     getDefinitionAtPosition(document: TextDocument, position: Position): Promise<Location | undefined | null>;
+    addXLRTransforms(transforms: Record<string, TransformFunction>): void;
+    addLSPPlugin(plugin: PlayerLanguageServicePlugin): void;
     setAssetTypes(typeFiles: Array<string>): Promise<void>;
 }
 

package/dist/index.esm.js

@@ -1855,48 +1855,41 @@ var __spreadValues$1 = (a, b) => {
   return a;
 };
 var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
-const applyCommonProps = (inputNode, capability) => {
-  const outputNode = __spreadValues$1({}, inputNode);
-  if (capability === "Assets") {
-    if (outputNode.type === "object") {
-      if (!outputNode.properties.applicability) {
-        outputNode.properties.applicability = {
-          required: false,
-          node: {
-            type: "or",
-            name: "Applicability",
-            description: "Evaluate the given expression (or boolean) and if falsy, remove this node from the tree. This is re-computed for each change in the data-model",
-            or: [
-              {
-                type: "boolean"
-              },
-              {
-                type: "ref",
-                ref: "Expression"
-              }
-            ]
-          }
-        };
-      }
+const applyCommonProps = (node, capability) => {
+  return simpleTransformGenerator("object", ["Assets", "Views"], (xlrNode) => {
+    if (!xlrNode.properties.applicability) {
+      xlrNode.properties.applicability = {
+        required: false,
+        node: {
+          type: "or",
+          name: "Applicability",
+          description: "Evaluate the given expression (or boolean) and if falsy, remove this node from the tree. This is re-computed for each change in the data-model",
+          or: [
+            {
+              type: "boolean"
+            },
+            {
+              type: "ref",
+              ref: "Expression"
+            }
+          ]
+        }
+      };
     }
-  }
-  if (outputNode.type === "object" && !outputNode.properties._comment) {
-    outputNode.properties._comment = {
-      required: false,
-      node: {
-        description: "Adds a comment for the given node",
-        type: "string"
-      }
-    };
-  } else if (outputNode.type === "and") {
-    outputNode.and.map((n) => applyCommonProps(n, capability));
-  } else if (outputNode.type === "or") {
-    outputNode.or.map((n) => applyCommonProps(n, capability));
-  }
-  return outputNode;
+    if (!xlrNode.properties._comment) {
+      xlrNode.properties._comment = {
+        required: false,
+        node: {
+          description: "Adds a comment for the given node",
+          type: "string"
+        }
+      };
+    }
+    return xlrNode;
+  })(node, capability);
 };
 const applyAssetWrapperOrSwitch = (node, capability) => {
-  return simpleTransformGenerator("ref", "Assets", (xlrNode) => {
+  return simpleTransformGenerator("ref", ["Assets", "Views"], (xlrNode) => {
     if (xlrNode.ref.includes("AssetWrapper")) {
       return __spreadProps$1(__spreadValues$1({}, xlrNode), {
         ref: xlrNode.ref.replace("AssetWrapper", "AssetWrapperOrSwitch")
@@ -1945,8 +1938,8 @@ const applyValueRefs = (node, capability) => {
   })(node, capability);
 };
 const applyTemplateProperty = (node, capability) => {
-  const templateTypes = [];
-  return simpleTransformGenerator("object", "Assets", (inputNode) => {
+  return simpleTransformGenerator("object", ["Assets", "Views"], (inputNode) => {
+    const templateTypes = [];
     const xlrNode = __spreadValues$1({}, inputNode);
     for (const key in xlrNode.properties) {
       const value = xlrNode.properties[key];
@@ -2441,6 +2434,12 @@ class PlayerLanguageService {
       return this.hooks.definition.call(context);
     });
   }
+  addXLRTransforms(transforms) {
+    Object.entries(transforms).forEach(([name, fn]) => this.XLRService.XLRSDK.addTransformFunction(name, fn));
+  }
+  addLSPPlugin(plugin) {
+    plugin.apply(this);
+  }
   setAssetTypes(typeFiles) {
     return __async(this, null, function* () {
       typeFiles.forEach((file) => {

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@player-tools/json-language-service",
-  "version": "0.4.2--canary.69.1573",
+  "version": "0.4.2-next.1",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "peerDependencies": {},
   "dependencies": {
-    "@player-tools/xlr": "0.4.2--canary.69.1573",
-    "@player-tools/xlr-sdk": "0.4.2--canary.69.1573",
-    "@player-tools/xlr-utils": "0.4.2--canary.69.1573",
+    "@player-tools/xlr": "0.4.2-next.1",
+    "@player-tools/xlr-sdk": "0.4.2-next.1",
+    "@player-tools/xlr-utils": "0.4.2-next.1",
     "change-case": "^4.1.1",
     "cross-fetch": "^3.0.5",
     "detect-indent": "^6.0.0",

package/src/index.ts

@@ -27,6 +27,7 @@ import {
   CodeActionKind,
 } from 'vscode-languageserver-types';
 
+import type { TransformFunction } from '@player-tools/xlr';
 import type {
   DocumentContext,
   ValidationContext,
@@ -415,6 +416,16 @@ export class PlayerLanguageService {
     return this.hooks.definition.call(context);
   }
 
+  public addXLRTransforms(transforms: Record<string, TransformFunction>): void {
+    Object.entries(transforms).forEach(([name, fn]) =>
+      this.XLRService.XLRSDK.addTransformFunction(name, fn)
+    );
+  }
+
+  public addLSPPlugin(plugin: PlayerLanguageServicePlugin) {
+    plugin.apply(this);
+  }
+
   async setAssetTypes(typeFiles: Array<string>) {
     // await this.typescriptService.setAssetTypes(typeFiles);
     typeFiles.forEach((file) => {

package/src/xlr/transforms.ts

@@ -1,6 +1,6 @@
 /* eslint-disable guard-for-in */
 /* eslint-disable no-restricted-syntax */
-/* eslint-disable no-param-reassign */
+
 import type {
   ArrayType,
   NamedType,
@@ -15,51 +15,44 @@ import { isPrimitiveTypeNode } from '@player-tools/xlr-utils';
 /**
  * Adds applicability and _comment properties to Assets
  */
-export const applyCommonProps: TransformFunction = (
-  inputNode: NamedType | NodeType,
-  capability: string
-) => {
-  const outputNode = { ...inputNode };
-  if (capability === 'Assets') {
-    if (outputNode.type === 'object') {
-      if (!outputNode.properties.applicability) {
-        outputNode.properties.applicability = {
-          required: false,
-          node: {
-            type: 'or',
-            name: 'Applicability',
-            description:
-              'Evaluate the given expression (or boolean) and if falsy, remove this node from the tree. This is re-computed for each change in the data-model',
-            or: [
-              {
-                type: 'boolean',
-              },
-              {
-                type: 'ref',
-                ref: 'Expression',
-              },
-            ],
-          },
-        };
-      }
+
+export const applyCommonProps: TransformFunction = (node, capability) => {
+  return simpleTransformGenerator('object', ['Assets', 'Views'], (xlrNode) => {
+    if (!xlrNode.properties.applicability) {
+      // eslint-disable-next-line no-param-reassign
+      xlrNode.properties.applicability = {
+        required: false,
+        node: {
+          type: 'or',
+          name: 'Applicability',
+          description:
+            'Evaluate the given expression (or boolean) and if falsy, remove this node from the tree. This is re-computed for each change in the data-model',
+          or: [
+            {
+              type: 'boolean',
+            },
+            {
+              type: 'ref',
+              ref: 'Expression',
+            },
+          ],
+        },
+      };
     }
-  }
 
-  if (outputNode.type === 'object' && !outputNode.properties._comment) {
-    outputNode.properties._comment = {
-      required: false,
-      node: {
-        description: 'Adds a comment for the given node',
-        type: 'string',
-      },
-    };
-  } else if (outputNode.type === 'and') {
-    outputNode.and.map((n) => applyCommonProps(n, capability));
-  } else if (outputNode.type === 'or') {
-    outputNode.or.map((n) => applyCommonProps(n, capability));
-  }
+    if (!xlrNode.properties._comment) {
+      // eslint-disable-next-line no-param-reassign
+      xlrNode.properties._comment = {
+        required: false,
+        node: {
+          description: 'Adds a comment for the given node',
+          type: 'string',
+        },
+      };
+    }
 
-  return outputNode;
+    return xlrNode;
+  })(node, capability);
 };
 
 /**
@@ -69,7 +62,7 @@ export const applyAssetWrapperOrSwitch: TransformFunction = (
   node,
   capability
 ) => {
-  return simpleTransformGenerator('ref', 'Assets', (xlrNode) => {
+  return simpleTransformGenerator('ref', ['Assets', 'Views'], (xlrNode) => {
     if (xlrNode.ref.includes('AssetWrapper')) {
       return {
         ...xlrNode,
@@ -130,39 +123,43 @@ export const applyValueRefs: TransformFunction = (node, capability) => {
  * Computes possible template keys and adds them to an Asset
  */
 export const applyTemplateProperty: TransformFunction = (node, capability) => {
-  const templateTypes: Array<RefType> = [];
-  return simpleTransformGenerator('object', 'Assets', (inputNode) => {
-    const xlrNode = { ...inputNode };
-    for (const key in xlrNode.properties) {
-      const value = xlrNode.properties[key];
-      if (value.node.type === 'array') {
-        value.required = false;
-        templateTypes.push({
-          type: 'ref',
-          ref: `Template<${
-            value.node.elementType.type === 'ref'
-              ? value.node.elementType.ref
-              : value.node.elementType.name
-          }, "${key}">`,
-        });
+  return simpleTransformGenerator(
+    'object',
+    ['Assets', 'Views'],
+    (inputNode) => {
+      const templateTypes: Array<RefType> = [];
+      const xlrNode = { ...inputNode };
+      for (const key in xlrNode.properties) {
+        const value = xlrNode.properties[key];
+        if (value.node.type === 'array') {
+          value.required = false;
+          templateTypes.push({
+            type: 'ref',
+            ref: `Template<${
+              value.node.elementType.type === 'ref'
+                ? value.node.elementType.ref
+                : value.node.elementType.name
+            }, "${key}">`,
+          });
+        }
       }
-    }
 
-    if (templateTypes.length > 0) {
-      const templateType: ArrayType = {
-        type: 'array',
-        elementType:
-          templateTypes.length > 1
-            ? { type: 'or', or: templateTypes }
-            : templateTypes[0],
-        description: 'A list of templates to process for this node',
-      };
-      xlrNode.properties.template = {
-        required: false,
-        node: templateType,
-      };
-    }
+      if (templateTypes.length > 0) {
+        const templateType: ArrayType = {
+          type: 'array',
+          elementType:
+            templateTypes.length > 1
+              ? { type: 'or', or: templateTypes }
+              : templateTypes[0],
+          description: 'A list of templates to process for this node',
+        };
+        xlrNode.properties.template = {
+          required: false,
+          node: templateType,
+        };
+      }
 
-    return xlrNode;
-  })(node, capability);
+      return xlrNode;
+    }
+  )(node, capability);
 };