@based/schema 2.2.13 → 2.3.0

package/dist/src/set/fields/index.js

@@ -57,7 +57,6 @@ export const fields = {
         }
     },
     enum: async (args) => {
-        // args.stop()
         const enumValues = args.fieldSchema.enum;
         for (let i = 0; i < enumValues.length; i++) {
             if (deepEqual(enumValues[i], args.value)) {

package/dist/src/set/index.js

@@ -6,6 +6,10 @@ const opts = {
     parsers: {
         keys: {
             $delete: async (args) => {
+                const type = args.fieldSchema?.type;
+                if (type === 'json') {
+                    return;
+                }
                 if (args.prev === args.root) {
                     args.error(ParseError.cannotDeleteNodeFromModify);
                     return;
@@ -18,6 +22,10 @@ const opts = {
                 }
             },
             $alias: async (args) => {
+                const type = args.fieldSchema?.type;
+                if (type === 'json') {
+                    return;
+                }
                 if (Array.isArray(args.value)) {
                     for (const field of args.value) {
                         if (typeof field !== 'string') {
@@ -32,6 +40,10 @@ const opts = {
                 }
             },
             $merge: async (args) => {
+                const type = args.fieldSchema?.type;
+                if (type === 'json') {
+                    return;
+                }
                 if (typeof args.value !== 'boolean') {
                     args.error(ParseError.incorrectFormat);
                     return;
@@ -42,12 +54,20 @@ const opts = {
                 return;
             },
             $id: async (args) => {
+                const type = args.fieldSchema?.type;
+                if (type === 'json') {
+                    return;
+                }
                 if (!isValidId(args.schema, args.value)) {
                     args.error(ParseError.incorrectFormat);
                     return;
                 }
             },
             $language: async (args) => {
+                const type = args.fieldSchema?.type;
+                if (type === 'json') {
+                    return;
+                }
                 if (!(args.schema.translations || [])
                     .concat(args.schema.language)
                     .includes(args.value)) {
@@ -57,7 +77,10 @@ const opts = {
             },
             $value: async (args) => {
                 const type = args.fieldSchema?.type;
-                if (type === 'text' || type === 'set' || type == 'references') {
+                if (type === 'text' ||
+                    type === 'set' ||
+                    type == 'references' ||
+                    type === 'json') {
                     return;
                 }
                 args.prev.stop();
@@ -73,7 +96,10 @@ const opts = {
             },
             $default: async (args) => {
                 const type = args.fieldSchema?.type;
-                if (type === 'number' || type === 'integer' || type === 'text') {
+                if (type === 'number' ||
+                    type === 'integer' ||
+                    type === 'text' ||
+                    type === 'json') {
                     // default can exist with $incr and $decr
                     return;
                 }

package/dist/src/types.d.ts

@@ -121,7 +121,6 @@ export type BasedSchemaFieldReference = {
     bidirectional?: {
         fromField: string;
     };
-    sortable?: boolean;
     allowedTypes?: AllowedTypes;
 } & BasedSchemaFieldShared;
 export type BasedSchemaFieldReferences = {
@@ -129,6 +128,7 @@ export type BasedSchemaFieldReferences = {
     bidirectional?: {
         fromField: string;
     };
+    sortable?: boolean;
     allowedTypes?: AllowedTypes;
 } & BasedSchemaFieldShared;
 export type BasedSchemaFields = {

package/dist/test/json.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/json.js

@@ -0,0 +1,40 @@
+import test from 'ava';
+import { setWalker } from '../src/index.js';
+import { errorCollect, resultCollect } from './utils/index.js';
+const schema = {
+    types: {
+        aType: {
+            prefix: 'at',
+            fields: {
+                json: {
+                    type: 'json',
+                },
+            },
+        },
+    },
+    $defs: {},
+    language: 'en',
+    root: {
+        fields: {},
+    },
+    prefixToTypeMapping: {
+        at: 'aType',
+    },
+};
+test('json field with keys in it', async (t) => {
+    const json = {
+        fieldA: 'record2FieldA',
+        $id: '$id_inside_json',
+        $alias: '$alias_inside_json',
+    };
+    const res = await setWalker(schema, {
+        // type: 'aType',
+        $id: 'at1',
+        json,
+    });
+    t.assert(!errorCollect(res).length);
+    t.deepEqual(resultCollect(res), [
+        { path: ['json'], value: JSON.stringify(json) },
+    ]);
+});
+//# sourceMappingURL=json.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/schema",
-  "version": "2.2.13",
+  "version": "2.3.0",
   "license": "MIT",
   "main": "dist/src/index.js",
   "files": [