@based/schema 1.3.0 → 1.3.2

package/dist/set/parseDefaultAndValue.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseValueAndDefault = void 0;
+const error_1 = require("./error");
+const parsers_1 = __importDefault(require("./parsers"));
+const parseValueAndDefault = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    let handled = false;
+    if (typeof value === 'object') {
+        const typeDef = fieldSchema.type ?? ('enum' in fieldSchema ? 'enum' : '');
+        const parse = parsers_1.default[typeDef];
+        if (value.$value !== undefined) {
+            // TODO: for errors handle path a bit smarter...
+            await parse(path, value.$value, fieldSchema, typeSchema, target, handlers, true);
+            handled = true;
+        }
+        if (value.$default !== undefined) {
+            if (value.$value !== undefined) {
+                (0, error_1.error)(path, error_1.ParseError.valueAndDefault);
+            }
+            await parse(path, value.$default, fieldSchema, typeSchema, target, handlers, true);
+            handled = true;
+        }
+    }
+    if (handled && !noCollect) {
+        handlers.collect({ path, value, typeSchema, fieldSchema, target });
+    }
+    return handled;
+};
+exports.parseValueAndDefault = parseValueAndDefault;
+//# sourceMappingURL=parseDefaultAndValue.js.map

package/dist/set/parseDefaultAndValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseDefaultAndValue.js","sourceRoot":"","sources":["../../src/set/parseDefaultAndValue.ts"],"names":[],"mappings":";;;;;;AAEA,mCAA2C;AAC3C,wDAA+B;AAExB,MAAM,oBAAoB,GAAoC,KAAK,EACxE,IAAI,EACJ,KAAK,EACL,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,SAAS,EACS,EAAE;IACpB,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QACzE,MAAM,KAAK,GAAG,iBAAO,CAAC,OAAO,CAAC,CAAA;QAC9B,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE;YAC9B,gDAAgD;YAChD,MAAM,KAAK,CACT,IAAI,EACJ,KAAK,CAAC,MAAM,EACZ,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,IAAI,CACL,CAAA;YACD,OAAO,GAAG,IAAI,CAAA;SACf;QACD,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE;YAChC,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC9B,IAAA,aAAK,EAAC,IAAI,EAAE,kBAAU,CAAC,eAAe,CAAC,CAAA;aACxC;YACD,MAAM,KAAK,CACT,IAAI,EACJ,KAAK,CAAC,QAAQ,EACd,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,IAAI,CACL,CAAA;YACD,OAAO,GAAG,IAAI,CAAA;SACf;KACF;IACD,IAAI,OAAO,IAAI,CAAC,SAAS,EAAE;QACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAA;KACnE;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AA9CY,QAAA,oBAAoB,wBA8ChC"}

package/dist/set/parsers.d.ts

@@ -0,0 +1,3 @@
+import { Parsers } from './types';
+declare const parsers: Parsers;
+export default parsers;

package/dist/set/parsers.js

@@ -0,0 +1,42 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const references = __importStar(require("./references"));
+const collections = __importStar(require("./collections"));
+const number = __importStar(require("./number"));
+const string = __importStar(require("./string"));
+const rest_1 = require("./rest");
+const parsers = {
+    ...string,
+    ...references,
+    ...collections,
+    ...number,
+    enum: rest_1.enumParser,
+    boolean: rest_1.boolean,
+    cardinality: rest_1.cardinality,
+    json: rest_1.json,
+};
+exports.default = parsers;
+//# sourceMappingURL=parsers.js.map

package/dist/set/parsers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parsers.js","sourceRoot":"","sources":["../../src/set/parsers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,yDAA0C;AAC1C,2DAA4C;AAC5C,iDAAkC;AAClC,iDAAkC;AAElC,iCAA+D;AAE/D,MAAM,OAAO,GAAY;IACvB,GAAG,MAAM;IACT,GAAG,UAAU;IACb,GAAG,WAAW;IACd,GAAG,MAAM;IACT,IAAI,EAAE,iBAAU;IAChB,OAAO,EAAP,cAAO;IACP,WAAW,EAAX,kBAAW;IACX,IAAI,EAAJ,WAAI;CACL,CAAA;AAED,kBAAe,OAAO,CAAA"}

package/dist/set/references.d.ts

@@ -0,0 +1,3 @@
+import { Parser } from './types';
+export declare const reference: Parser<'reference'>;
+export declare const references: Parser<'references'>;

package/dist/set/references.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.references = exports.reference = void 0;
+const error_1 = require("./error");
+const reference = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    // $no root
+    // prob pass these as options
+    // value .default
+    // $value
+    if (typeof value !== 'string') {
+        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+    }
+    if ('allowedTypes' in fieldSchema) {
+        const prefix = value.slice(0, 2);
+        const targetType = target.schema.prefixToTypeMapping[prefix];
+        if (!targetType) {
+            (0, error_1.error)(path, error_1.ParseError.referenceIsIncorrectType);
+        }
+        let typeMatches = false;
+        for (const t of fieldSchema.allowedTypes) {
+            if (typeof t === 'string') {
+                if (t === targetType) {
+                    typeMatches = true;
+                    break;
+                }
+            }
+            else {
+                if (t.type && t.type === targetType) {
+                    typeMatches = true;
+                    if (t.$filter) {
+                        if (!(await handlers.referenceFilterCondition(value, t.$filter))) {
+                            (0, error_1.error)(path, error_1.ParseError.referenceIsIncorrectType);
+                        }
+                    }
+                }
+                else if (!t.type && t.$filter) {
+                    if (!(await handlers.referenceFilterCondition(value, t.$filter))) {
+                        (0, error_1.error)(path, error_1.ParseError.referenceIsIncorrectType);
+                    }
+                }
+            }
+        }
+        if (typeMatches === false) {
+            (0, error_1.error)(path, error_1.ParseError.referenceIsIncorrectType);
+        }
+    }
+    if (!noCollect) {
+        handlers.collect({ path, value, typeSchema, fieldSchema, target });
+    }
+};
+exports.reference = reference;
+const references = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    // default
+    // $no root
+    if (Array.isArray(value)) {
+        await Promise.all(value.map((v, i) => {
+            return (0, exports.reference)([...path, i], v, 
+            // not nice slow
+            { ...fieldSchema, type: 'reference' }, typeSchema, target, handlers, true);
+        }));
+        value = { $value: value };
+    }
+    else if (typeof value === 'object') {
+        if (value.$add) {
+            await Promise.all(value.$add.map((v, i) => {
+                return (0, exports.reference)([...path, '$add', i], v, 
+                // not nice slow
+                { ...fieldSchema, type: 'reference' }, typeSchema, target, handlers, true);
+            }));
+        }
+    }
+    if (!noCollect) {
+        handlers.collect({ path, value, typeSchema, fieldSchema, target });
+    }
+};
+exports.references = references;
+//# sourceMappingURL=references.js.map

package/dist/set/references.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"references.js","sourceRoot":"","sources":["../../src/set/references.ts"],"names":[],"mappings":"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"}

package/dist/set/rest.d.ts

@@ -0,0 +1,5 @@
+import { Parser } from './types';
+export declare const cardinality: Parser<'cardinality'>;
+export declare const boolean: Parser<'boolean'>;
+export declare const enumParser: Parser<'enum'>;
+export declare const json: Parser<'json'>;

package/dist/set/rest.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.json = exports.enumParser = exports.boolean = exports.cardinality = void 0;
+const utils_1 = require("@saulx/utils");
+const hash_1 = require("@saulx/hash");
+const error_1 = require("./error");
+const parseDefaultAndValue_1 = require("./parseDefaultAndValue");
+const cardinality = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    if (value && typeof value === 'object') {
+        if (value.$default !== undefined) {
+            (0, error_1.error)(path, error_1.ParseError.defaultNotSupported);
+        }
+        if (value.$value !== undefined) {
+            value = (0, hash_1.hashObjectIgnoreKeyOrder)(value.$value).toString(16);
+        }
+        else {
+            value = (0, hash_1.hashObjectIgnoreKeyOrder)(value).toString(16);
+        }
+    }
+    else {
+        value = (0, hash_1.hash)(value).toString(16);
+    }
+    if (!noCollect) {
+        handlers.collect({ path, value, typeSchema, fieldSchema, target });
+    }
+};
+exports.cardinality = cardinality;
+const boolean = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    if (await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, noCollect)) {
+        return;
+    }
+    if (typeof value !== 'boolean') {
+        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+    }
+    if (!noCollect) {
+        handlers.collect({ path, value, typeSchema, fieldSchema, target });
+    }
+};
+exports.boolean = boolean;
+const enumParser = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    const enumValues = fieldSchema.enum;
+    if (!(await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, noCollect))) {
+        for (let i = 0; i < enumValues.length; i++) {
+            if ((0, utils_1.deepEqual)(enumValues[i], value)) {
+                if (!noCollect) {
+                    handlers.collect({ path, value: i, typeSchema, fieldSchema, target });
+                }
+                return;
+            }
+        }
+        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+    }
+};
+exports.enumParser = enumParser;
+const json = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    if (await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, noCollect)) {
+        return;
+    }
+    try {
+        const parsedValue = JSON.stringify(value);
+        if (!noCollect) {
+            handlers.collect({
+                path,
+                value: parsedValue,
+                typeSchema,
+                fieldSchema,
+                target,
+            });
+        }
+    }
+    catch (err) {
+        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+    }
+};
+exports.json = json;
+//# sourceMappingURL=rest.js.map

package/dist/set/rest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../src/set/rest.ts"],"names":[],"mappings":"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"}

package/dist/set/string.d.ts

@@ -0,0 +1,3 @@
+import { Parser } from './types';
+export declare const string: Parser<'string'>;
+export declare const text: Parser<'text'>;

package/dist/set/string.js

@@ -0,0 +1,173 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.text = exports.string = void 0;
+const error_1 = require("./error");
+const validator_1 = __importDefault(require("validator"));
+const parseDefaultAndValue_1 = require("./parseDefaultAndValue");
+const formatPatterns = {
+    email: validator_1.default.isEmail,
+    URL: validator_1.default.isURL,
+    MACAddress: validator_1.default.isMACAddress,
+    IP: validator_1.default.isIP,
+    IPRange: validator_1.default.isIPRange,
+    FQDN: validator_1.default.isFQDN,
+    IBAN: validator_1.default.isIBAN,
+    BIC: validator_1.default.isBIC,
+    alpha: validator_1.default.isAlpha,
+    alphaLocales: validator_1.default.isAlphaLocales,
+    alphanumeric: validator_1.default.isAlphanumeric,
+    alphanumericLocales: validator_1.default.isAlphanumericLocales,
+    passportNumber: validator_1.default.isPassportNumber,
+    port: validator_1.default.isPort,
+    lowercase: validator_1.default.isLowercase,
+    uppercase: validator_1.default.isUppercase,
+    ascii: validator_1.default.isAscii,
+    semVer: validator_1.default.isSemVer,
+    surrogatePair: validator_1.default.isSurrogatePair,
+    IMEI: validator_1.default.isIMEI,
+    hexadecimal: validator_1.default.isHexadecimal,
+    octal: validator_1.default.isOctal,
+    hexColor: validator_1.default.isHexColor,
+    rgbColor: validator_1.default.isRgbColor,
+    HSL: validator_1.default.isHSL,
+    ISRC: validator_1.default.isISRC,
+    MD5: validator_1.default.isMD5,
+    JWT: validator_1.default.isJWT,
+    UUID: validator_1.default.isUUID,
+    luhnNumber: validator_1.default.isLuhnNumber,
+    creditCard: validator_1.default.isCreditCard,
+    identityCard: validator_1.default.isIdentityCard,
+    EAN: validator_1.default.isEAN,
+    ISIN: validator_1.default.isISIN,
+    ISBN: validator_1.default.isISBN,
+    ISSN: validator_1.default.isISSN,
+    mobilePhone: validator_1.default.isMobilePhone,
+    mobilePhoneLocales: validator_1.default.isMobilePhoneLocales,
+    postalCode: validator_1.default.isPostalCode,
+    postalCodeLocales: validator_1.default.isPostalCodeLocales,
+    ethereumAddress: validator_1.default.isEthereumAddress,
+    currency: validator_1.default.isCurrency,
+    btcAddress: validator_1.default.isBtcAddress,
+    ISO6391: validator_1.default.isISO6391,
+    ISO8601: validator_1.default.isISO8601,
+    RFC3339: validator_1.default.isRFC3339,
+    ISO31661Alpha2: validator_1.default.isISO31661Alpha2,
+    ISO31661Alpha3: validator_1.default.isISO31661Alpha3,
+    ISO4217: validator_1.default.isISO4217,
+    base32: validator_1.default.isBase32,
+    base58: validator_1.default.isBase58,
+    base64: validator_1.default.isBase64,
+    dataURI: validator_1.default.isDataURI,
+    magnetURI: validator_1.default.isMagnetURI,
+    mimeType: validator_1.default.isMimeType,
+    latLong: validator_1.default.isLatLong,
+    slug: validator_1.default.isSlug,
+    strongPassword: validator_1.default.isStrongPassword,
+    taxID: validator_1.default.isTaxID,
+    licensePlate: validator_1.default.isLicensePlate,
+    VAT: validator_1.default.isVAT,
+};
+const validate = (path, value, fieldSchema) => {
+    if (typeof value !== 'string') {
+        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+    }
+    if (fieldSchema.minLength && value.length < fieldSchema.minLength) {
+        (0, error_1.error)(path, error_1.ParseError.subceedsMinimum);
+    }
+    if (fieldSchema.maxLength && value.length > fieldSchema.maxLength) {
+        (0, error_1.error)(path, error_1.ParseError.exceedsMaximum);
+    }
+    if (fieldSchema.pattern) {
+        const re = new RegExp(fieldSchema.pattern);
+        if (!re.test(value)) {
+            (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+        }
+    }
+    if (fieldSchema.format && !formatPatterns[fieldSchema.format](value)) {
+        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+    }
+};
+const string = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    if (await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, noCollect)) {
+        return;
+    }
+    validate(path, value, fieldSchema);
+    if (!noCollect) {
+        handlers.collect({ path, value, typeSchema, fieldSchema, target });
+    }
+};
+exports.string = string;
+const text = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    const valueType = typeof value;
+    if (target.$language && valueType === 'string') {
+        validate(path, value, fieldSchema);
+        if (!noCollect) {
+            handlers.collect({
+                path,
+                value: { [target.$language]: value },
+                typeSchema,
+                fieldSchema,
+                target,
+            });
+        }
+        return;
+    }
+    if (valueType !== 'object') {
+        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+    }
+    if (target.$language &&
+        (await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, noCollect))) {
+        return;
+    }
+    else if (await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, true)) {
+        if (!noCollect) {
+            handlers.collect({
+                path,
+                value,
+                typeSchema,
+                fieldSchema,
+                target,
+            });
+        }
+        return;
+    }
+    for (const key in value) {
+        const newPath = [...path, key];
+        // @ts-ignore
+        if (!target.schema.languages.includes(key)) {
+            (0, error_1.error)(newPath, error_1.ParseError.languageNotSupported);
+        }
+        if (typeof value[key] === 'object') {
+            if (value[key].$value) {
+                await (0, exports.text)([...newPath, '$value'], value[key].$value, fieldSchema, typeSchema, target, handlers, true);
+            }
+            if (!noCollect) {
+                handlers.collect({
+                    path: newPath,
+                    value: null,
+                    typeSchema,
+                    fieldSchema,
+                    target,
+                });
+            }
+            continue;
+        }
+        if (!(await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, { [key]: value[key] }, fieldSchema, typeSchema, target, handlers, true))) {
+            validate(newPath, value[key], fieldSchema);
+        }
+        if (!noCollect) {
+            handlers.collect({
+                path: newPath,
+                value: value[key],
+                typeSchema,
+                fieldSchema,
+                target,
+            });
+        }
+    }
+};
+exports.text = text;
+//# sourceMappingURL=string.js.map

package/dist/set/string.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/set/string.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/schema",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "license": "MIT",
   "main": "dist/index.js",
   "scripts": {

package/src/set/fields/object.ts

@@ -6,6 +6,7 @@ export const object: FieldParser<'object'> = async (args) => {
     args.error(ParseError.incorrectFormat)
     return
   }
+
   const isArray = Array.isArray(args.value)
   if (isArray) {
     args.error(ParseError.incorrectFormat)

package/src/set/fields/string.ts

@@ -164,6 +164,7 @@ export const text: FieldParser<'text'> = async (args) => {
             args
               .create({
                 key: k,
+                fieldSchema: { type: 'string' },
                 value: { $default: args.value[key][k] },
               })
               .collect()
@@ -180,6 +181,7 @@ export const text: FieldParser<'text'> = async (args) => {
         } else {
           args
             .create({
+              fieldSchema: { type: 'string' },
               key: args.target.$language,
               value: { $default: args.value[key] },
             })
@@ -196,6 +198,7 @@ export const text: FieldParser<'text'> = async (args) => {
               args
                 .create({
                   key,
+                  fieldSchema: { type: 'string' },
                   value: args.value[key],
                 })
                 .collect()
@@ -206,6 +209,7 @@ export const text: FieldParser<'text'> = async (args) => {
                 args
                   .create({
                     key,
+                    fieldSchema: { type: 'string' },
                     value: args.value[key].$value,
                   })
                   .collect()
@@ -217,6 +221,7 @@ export const text: FieldParser<'text'> = async (args) => {
                 args
                   .create({
                     key,
+                    fieldSchema: { type: 'string' },
                     value: { $default: args.value[key].$default },
                   })
                   .collect()
@@ -236,6 +241,7 @@ export const text: FieldParser<'text'> = async (args) => {
           args
             .create({
               key,
+              fieldSchema: { type: 'string' },
               value: args.value[key],
             })
             .collect()
@@ -269,6 +275,7 @@ export const text: FieldParser<'text'> = async (args) => {
     .create({
       value,
       key: args.target.$language,
+      fieldSchema: { type: 'string' },
     })
     .collect()
 
@@ -278,77 +285,3 @@ export const text: FieldParser<'text'> = async (args) => {
     })
   }
 }
-
-/*
-const value = args.value
-  if (value !== null && typeof value === 'object') {
-    args.stop()
-    const result: any = {}
-    for (const key in value) {
-      if (key === '$value') {
-        const nValue = await next(args, key)
-        if (typeof nValue === 'object') {
-          deepMerge(result, nValue)
-        } else {
-          args.error(ParseError.incorrectFormat)
-          return
-        }
-      } else if (key === '$default') {
-        result.$default = await next(args, key)
-      } else if (args.schema.languages.includes(<BasedSchemaLanguage>key)) {
-        if (value[key] && typeof value[key] === 'object') {
-          for (const k in value[key]) {
-            if (k === '$value') {
-              if (!validateString(args, value[key].$value)) {
-                args.create({ key }).error(ParseError.incorrectFormat)
-              } else {
-                result[key] = value[key].$value
-              }
-            } else if (k === '$default') {
-              if (!validateString(args, value[key].$default)) {
-                args.create({ key }).error(ParseError.incorrectFormat)
-              } else {
-                setByPath(result, ['$default', key], value[key].$default)
-              }
-            } else {
-              args
-                .create({ path: [...args.path, key, k] })
-                .error(ParseError.fieldDoesNotExist)
-            }
-          }
-        } else {
-          if (!validateString(args, args.value[key])) {
-            args.error(ParseError.incorrectFormat)
-            return
-          }
-          result[key] = args.value[key]
-        }
-      } else {
-        args.create({ key }).error(ParseError.languageNotSupported)
-      }
-    }
-    args.collect(result)
-    return
-  }
-
-  if (typeof value !== 'string') {
-    args.error(ParseError.incorrectFormat)
-    return
-  }
-
-  if (!args.target.$language) {
-    args.error(ParseError.noLanguageFound)
-    return
-  }
-
-  if (!validateString(args, args.value)) {
-    args.error(ParseError.incorrectFormat)
-    return
-  }
-
-  args.value = {
-    [args.target.$language]: value,
-  }
-
-  args.collect()
-*/

package/src/set/index.ts

@@ -38,6 +38,11 @@ const opts: Opts<BasedSetTarget> = {
           args.error(ParseError.incorrectFormat)
           return
         }
+
+        if (args.prev !== args.root) {
+          args.prev.collect({ $delete: true })
+        }
+
         return
       },
       $id: async (args) => {

package/test/set.ts

@@ -79,7 +79,10 @@ test('$merge on object', async (t) => {
 
   t.true(r.errors.length === 0)
   t.deepEqual(resultCollect(r), [
+    { path: ['x'], value: { $delete: true } },
+
     { path: ['x', 'bla'], value: 'x' },
+
     { path: ['x'], value: { $merge: false, bla: 'x' } },
   ])
 })

package/test/text.ts

@@ -326,6 +326,8 @@ test('$default in collected path + $merge:false', async (t) => {
   })
   t.is(r.errors.length, 0)
   t.deepEqual(resultCollect(r), [
+    { path: ['text'], value: { $delete: true } },
+
     { path: ['text', 'en'], value: { $default: 'title' } },
     {
       path: ['text'],