@strictly/define 0.0.31 → 0.0.33

package/.out/transformers/copies/copyTo.js

@@ -68,8 +68,7 @@ function copyUnion(typeDef, value, copier) {
     // is it a discriminated union with a struct?
     if (discriminator != null) {
         const discriminatorValue = value[discriminator];
-        const discriminatingUnion = Object.assign(Object.assign({}, internalCopyTo(unions[discriminatorValue], value, copier)), { [discriminator]: discriminatorValue });
-        return copier(discriminatingUnion, typeDef);
+        return internalCopyTo(unions[discriminatorValue], value, copier);
     }
     // is it a `<constant1> | <constant2> | X`? We can handle that
     // a good example is when we `| null` something

package/.out/transformers/copies/mobxCopy.js

@@ -1,5 +1,5 @@
 import { reduce, UnreachableError, } from '@strictly/base';
-import { makeObservable, observable, } from 'mobx';
+import { observable, } from 'mobx';
 import { getUnionTypeDef } from 'transformers/flatteners/flattenValueTo';
 import { TypeDefType, } from 'types/Type';
 import { copyTo, } from './copyTo';
@@ -21,7 +21,7 @@ function observeValue(v, def) {
             });
         case TypeDefType.Object:
             // `makeObservable` only observes the specified props
-            return makeObservable(v, reduce(def.fields, function (acc, k) {
+            return observable(v, reduce(def.fields, function (acc, k) {
                 // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
                 acc[k] = observable;
                 return acc;

package/.out/transformers/copies/specs/copyTo.tests.js

@@ -88,7 +88,7 @@ describe('copyTo', function () {
                     x: 1,
                 }, toString);
                 expect(c).toEqual({
-                    d: 'a',
+                    d: '"a"',
                     x: '1',
                 });
             });

package/.out/transformers/flatteners/flattenValueTo.d.ts

@@ -5,7 +5,7 @@ import { type ValueOfType } from 'types/ValueOfType';
 export type AnyValueType = any;
 export type Setter<V> = (v: V) => void;
 export type Mapper<R> = (t: StrictTypeDef, v: AnyValueType, setter: Setter<AnyValueType>, typePath: string, valuePath: string) => R;
-export declare function flattenValueTo<T extends StrictType, M, R extends Readonly<Record<string, M>>>({ definition }: T, v: ValueOfType<T>, setter: Setter<ValueOfType<T>>, mapper: Mapper<M>, listIndicesToKeys?: Record<string, number[]>): R;
+export declare function flattenValueTo<T extends StrictType, M, R extends Readonly<Record<string, M>>>({ definition }: T, v: ValueOfType<ReadonlyTypeOfType<T>>, setter: Setter<ValueOfType<T>>, mapper: Mapper<M>, listIndicesToKeys?: Record<string, number[]>): R;
 export declare function getUnionTypeDef<T extends UnionTypeDef>(typeDef: T, v: ValueOfType<ReadonlyTypeOfType<{
     definition: T;
 }>>): any;

package/.out/transformers/flatteners/specs/flattenJsonValueToTypePathsOf.tests.js

@@ -87,6 +87,7 @@ describe('flattenJsonValueToTypePathsOf', function () {
                     $: '$',
                     '$:x.a': '$:x.a',
                     '$:x.b': '$:x.b',
+                    '$:x.d': '$:x.d',
                 });
             });
         });

package/.out/transformers/flatteners/specs/flattenTypeTo.tests.js

@@ -101,11 +101,13 @@ describe('flattenTypeDefTo', function () {
                 expect(flattened).toEqual({
                     $: TypeDefType.Union,
                     '$:a.a': TypeDefType.Literal,
+                    '$:a.d': TypeDefType.Literal,
                     '$:b.b': TypeDefType.Literal,
+                    '$:b.d': TypeDefType.Literal,
                 });
             });
             it('calls the mapper function', function () {
-                expect(toTypeDefType).toHaveBeenCalledTimes(3);
+                expect(toTypeDefType).toHaveBeenCalledTimes(5);
             });
         });
     });

package/.out/transformers/flatteners/specs/flattenValueTo.tests.js

@@ -210,6 +210,7 @@ describe('flattenValueTo', function () {
                     expect(flattened).toEqual({
                         $: '{"d":"1","a":2}',
                         ['$:1.a']: '2',
+                        ['$:1.d']: '"1"',
                     });
                 });
             });