js-core-1.4.0 - functions overrides will already be merged with base. deprecated field renamed

Author: elisherer

javascript/json-transform-core/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@nlighten/json-transform-core",
   "description": "Core types and utilities for handling JSON transformers",
-  "version": "1.3.4",
+  "version": "1.4.0",
   "main": "dist/json-transform-core.js",
   "umd:main": "dist/json-transform-core.umd.js",
   "module": "dist/json-transform-core.module.js",

javascript/json-transform-core/package.json

@@ -137,7 +137,7 @@ class FunctionsParser {
       if (func.overrides) {
         for (const override of func.overrides) {
           if (override.if.every(c => args[c.argument]?.toString().toUpperCase() === c.equals)) {
-            func = { ...func, ...override.then }; // replace func instance based on args
+            func = override.then; // replace func instance based on args
             break;
           }
         }
@@ -164,7 +164,7 @@ class FunctionsParser {
         if (func.overrides) {
           for (const override of func.overrides) {
             if (override.if.every(c => data[c.argument]?.toString().toUpperCase() === c.equals)) {
-              func = { ...func, ...override.then }; // replace func instance based on args
+              func = override.then; // replace func instance based on args
               break;
             }
           }

javascript/json-transform-core/src/functions/functionsParser.ts

@@ -14,11 +14,14 @@ function parseSchemas<T extends string>(
       func.custom = true;
     }
     if (Array.isArray(func.overrides)) {
-      func.overrides.forEach(o => {
-        if (o.then.outputSchema) {
-          o.then.parsedOutputSchema = JSONSchemaUtils.parse(o.then.outputSchema);
-        }
-      });
+      for (let i = 0; i < func.overrides.length; i++) {
+        const schemaOverride = func.overrides[i].then.outputSchema;
+        func.overrides[i] = {
+          ...func,
+          overrides: null,
+          parsedOutputSchema: schemaOverride && JSONSchemaUtils.parse(schemaOverride),
+        };
+      }
     }
   }
   return functions;

javascript/json-transform-core/src/functions/parseSchemas.ts

@@ -103,7 +103,7 @@ export type ArgumentCondition = {
 
 export type ConditionalOverrides = {
   if: ArgumentCondition[]; // AND relationship
-  then: Partial<FunctionDescriptor>;
+  then: FunctionDescriptor;
 };
 
 export type FunctionDescriptor = {
@@ -116,7 +116,8 @@ export type FunctionDescriptor = {
   overrides?: ConditionalOverrides[];
   /** For documentation purposes when output schema is calculated */
   outputSchemaTemplate?: TypeSchema;
-  deprecated?: string;
+  /** should specify the alternative function that should be used instead **/
+  deprecatedInFavorOf?: string;
   /** If set, this function does not alter the type of its primary argument */
   pipedType?: boolean;
   custom?: boolean;