Use JSON types from @croct/json (#122)

This commit also removes support for passing undefined properties in operations to keep it consistent with other places accepting JSON values.

Author: marcospassos

package-lock.json

@@ -28,6 +28,7 @@
     "build": "tsc"
   },
   "dependencies": {
+    "@croct/json": "^1.0",
     "tslib": "^2.3.1"
   },
   "devDependencies": {

package.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "github>croct-tech/renovate-public-presets:js"
+  ]
+}

renovate.json

@@ -1,5 +1,5 @@
+import {JsonStructure, JsonValue} from '@croct/json';
 import {Operation, Patch} from './patch';
-import {JsonArray, JsonObject, JsonValue} from './json';
 import {TrackingEvent} from './trackingEvents';
 import {
     addOperation,
@@ -64,16 +64,16 @@ export abstract class ActiveRecord<T extends TrackingEvent> {
         });
     }
 
-    public merge(value: JsonObject | JsonArray): this;
+    public merge(value: JsonStructure): this;
 
-    public merge(property: string, value: JsonObject | JsonArray): this;
+    public merge(property: string, value: JsonStructure): this;
 
-    public merge(propertyOrValue: string | JsonObject | JsonArray, value?: JsonObject | JsonArray): this {
+    public merge(propertyOrValue: string | JsonStructure, value?: JsonStructure): this {
         if (typeof propertyOrValue === 'string') {
             return this.pushOperation({
                 type: 'merge',
                 path: propertyOrValue,
-                value: value as JsonObject | JsonArray,
+                value: value as JsonStructure,
             });
         }
 

src/activeRecord.ts

@@ -1,4 +1,4 @@
-import {JsonObject, JsonValue} from './json';
+import {JsonObject, JsonValue} from '@croct/json';
 import {TokenProvider} from './token';
 import {EVALUATION_ENDPOINT_URL, MAX_EXPRESSION_LENGTH} from './constants';
 import {formatMessage} from './error';

src/evaluator.ts

@@ -1,5 +1,5 @@
+import {JsonObject, JsonValue} from '@croct/json';
 import {Evaluator, Campaign, EvaluationContext, Page} from '../evaluator';
-import {JsonObject, JsonValue} from '../json';
 import {Tab} from '../tab';
 import {optionsSchema} from '../schema';
 import {formatCause} from '../error';

src/facade/evaluatorFacade.ts

@@ -1,4 +1,4 @@
-import {LenientJsonArray, LenientJsonObject, LenientJsonValue} from './json';
+import {JsonStructure, JsonValue} from '@croct/json';
 
 interface AbstractOperation {
     type: string;
@@ -15,37 +15,37 @@ interface ClearOperation extends AbstractOperation {
 
 interface SetOperation extends AbstractOperation {
     type: 'set';
-    value: LenientJsonValue;
+    value: JsonValue;
 }
 
 interface AddOperation extends AbstractOperation {
     type: 'add';
-    value: LenientJsonValue;
+    value: JsonValue;
 }
 
 interface CombineOperation extends AbstractOperation {
     type: 'combine';
-    value: LenientJsonValue;
+    value: JsonValue;
 }
 
 interface MergeOperation extends AbstractOperation {
     type: 'merge';
-    value: LenientJsonArray | LenientJsonObject;
+    value: JsonStructure;
 }
 
 interface IncrementOperation extends AbstractOperation {
     type: 'increment';
-    value: LenientJsonValue;
+    value: JsonValue;
 }
 
 interface DecrementOperation extends AbstractOperation {
     type: 'decrement';
-    value: LenientJsonValue;
+    value: JsonValue;
 }
 
 interface removeOperation extends AbstractOperation {
     type: 'remove';
-    value: LenientJsonValue;
+    value: JsonValue;
 }
 
 export type Operation =

src/json.ts

@@ -1,5 +1,5 @@
+import {JsonArray, JsonObject, JsonPrimitive, JsonValue} from '@croct/json';
 import {Schema, TypeSchema, Violation} from './schema';
-import {JsonArray, JsonObject, JsonPrimitive, JsonValue} from '../json';
 import {describe, formatPath} from './violation';
 
 function isJsonPrimitive(value: unknown): value is JsonPrimitive {

src/patch.ts

@@ -1,7 +1,7 @@
+import {JsonObject} from '@croct/json';
 import {EvaluatorFacade, MinimalContextFactory, TabContextFactory} from '../../src/facade';
 import {Evaluator, Campaign, EvaluationOptions, Page} from '../../src/evaluator';
 import {Tab} from '../../src/tab';
-import {JsonObject} from '../../src/json';
 
 const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;