Merge pull request #191 from x0k/backport-modern-merger

Backport modern merger

Author: x0k

.changeset/eighty-rings-return.md

@@ -0,0 +1,5 @@
+---
+"@sjsf/form": minor
+---
+
+Export mergers from `form/mergers`

.changeset/tired-suits-attack.md

@@ -0,0 +1,5 @@
+---
+"@sjsf/form": minor
+---
+
+Add `json-schema`, `math`, `ord`, `traverser` libs, new `array` functions

mkfile

@@ -71,6 +71,8 @@ f/:
     pnpm run dev
   b:
     pnpm run build
+  ben:
+    pnpm run bench $@
   c:
     pnpm run check
   t:

packages/form/package.json

@@ -29,6 +29,7 @@
   "scripts": {
     "dev": "vite",
     "test": "vitest run --typecheck --exclude '.svelte-kit/**'",
+    "bench": "vitest bench --exclude '.svelte-kit/**'",
     "build": "svelte-package && publint",
     "check": "svelte-check --tsconfig ./tsconfig.json"
   },
@@ -44,12 +45,20 @@
     "svelte": "^5.33.0"
   },
   "devDependencies": {
+    "@types/json-schema-compare": "^0.2.4",
+    "ajv": "catalog:",
+    "allof-merge": "^0.6.7",
     "deep-freeze-es6": "^4.0.1",
+    "json-schema-compare": "^0.2.2",
     "svelte": "catalog:"
   },
   "types": "./dist/form/index.d.ts",
   "svelte": "./dist/form/index.js",
   "exports": {
+    "./lib/json-schema": {
+      "types": "./dist/lib/json-schema/index.d.ts",
+      "default": "./dist/lib/json-schema/index.js"
+    },
     "./lib/*.svelte": {
       "types": "./dist/lib/*.svelte.d.ts",
       "svelte": "./dist/lib/*.svelte"
@@ -111,6 +120,10 @@
       "types": "./dist/validators/*.d.ts",
       "default": "./dist/validators/*.js"
     },
+    "./mergers/*": {
+      "types": "./dist/mergers/*.d.ts",
+      "default": "./dist/mergers/*.js"
+    },
     "./focus-on-first-error": {
       "types": "./dist/focus-on-first-error.d.ts",
       "svelte": "./dist/focus-on-first-error.js"

packages/form/src/core/default-state.ts

@@ -2,13 +2,13 @@
 // Licensed under the Apache License, Version 2.0.
 // Modifications made by Roman Krasilnikov.
 
-import { isEmptyRecord, isObject } from "@/lib/object.js";
+import { isRecordEmpty, isObject } from "@/lib/object.js";
+import { isSchemaObject } from '@/lib/json-schema/index.js'
 
 import { resolveDependencies, retrieveSchema } from "./resolve.js";
 import {
   ALL_OF_KEY,
   DEPENDENCIES_KEY,
-  isSchema,
   type Schema,
   type SchemaArrayValue,
   type SchemaObjectValue,
@@ -359,7 +359,7 @@ export function computeDefaults(
           merger,
           rootSchema,
           rawFormData ?? schemaDefault,
-          schemaOneOf.filter(isSchema),
+          schemaOneOf.filter(isSchemaObject),
           0,
           getDiscriminatorFieldFromSchema(schema)
         )
@@ -380,7 +380,7 @@ export function computeDefaults(
           merger,
           rootSchema,
           rawFormData ?? schemaDefault,
-          schemaAnyOf.filter(isSchema),
+          schemaAnyOf.filter(isSchemaObject),
           0,
           getDiscriminatorFieldFromSchema(schema)
         )
@@ -509,7 +509,7 @@ function maybeAddDefaultToObject(
     if (
       Array.isArray(computedDefault)
         ? computedDefault.length > 0
-        : !isObject(computedDefault) || !isEmptyRecord(computedDefault)
+        : !isObject(computedDefault) || !isRecordEmpty(computedDefault)
     ) {
       obj.set(key, computedDefault);
     }

packages/form/src/core/definitions.ts

@@ -4,12 +4,9 @@
 
 import jsonpointer from "jsonpointer";
 
-import {
-  isSchema,
-  REF_KEY,
-  type Schema,
-  type SchemaDefinition,
-} from "./schema.js";
+import { isSchemaObject } from "@/lib/json-schema/index.js";
+
+import { REF_KEY, type Schema, type SchemaDefinition } from "./schema.js";
 import { mergeSchemas } from "./merge.js";
 
 export function resolveRef(ref: string, rootSchema: Schema) {
@@ -32,7 +29,7 @@ export function findSchemaDefinition(
   stack = new Set<string>()
 ): Schema {
   const current = resolveRef(ref, rootSchema);
-  if (!isSchema(current)) {
+  if (!isSchemaObject(current)) {
     throw new Error(`Definition for ${ref} should be a schema (object)`);
   }
   const nextRef = current[REF_KEY];

packages/form/src/core/discriminator.test.ts

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 // Modifications made by Roman Krasilnikov.
 
-import { afterAll, beforeAll, describe, expect, it, test, vi, type MockInstance } from 'vitest';
+import { describe, expect, it, test } from 'vitest';
 
 import { getDiscriminatorFieldFromSchema, getOptionMatchingSimpleDiscriminator } from './discriminator.js';
 import type { Schema } from './schema.js';

packages/form/src/core/is-select.ts

@@ -2,7 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 // Modifications made by Roman Krasilnikov.
 
-import { isSchema, type Schema, type SchemaValue } from "./schema.js";
+import { isSchemaObject } from '@/lib/json-schema/index.js';
+
+import type { Schema, SchemaValue } from "./schema.js";
 import type { Validator } from "./validator.js";
 import { retrieveSchema } from "./resolve.js";
 import {
@@ -71,7 +73,7 @@ export function getSelectOptionValues({
     return undefined;
   }
   return altSchema.map((schemaDef, i) => {
-    if (!isSchema(schemaDef)) {
+    if (!isSchemaObject(schemaDef)) {
       throw new Error(`Invalid enum definition in altSchema.${i}`);
     }
     return getSchemaConstantValue(schemaDef);

packages/form/src/core/known-properties.ts

@@ -1,5 +1,7 @@
+import { isSchemaObject } from '@/lib/json-schema/index.js'
+
 import { resolveRef } from "./definitions.js";
-import { isSchema, type Schema } from "./schema.js";
+import type { Schema } from "./schema.js";
 
 export function* getKnownProperties(
   { $ref: ref, properties, dependencies, oneOf, allOf, anyOf }: Schema,
@@ -12,7 +14,7 @@ export function* getKnownProperties(
     }
     stack.add(ref);
     const resolved = resolveRef(ref, rootSchema);
-    if (isSchema(resolved)) {
+    if (isSchemaObject(resolved)) {
       yield* getKnownProperties(resolved, rootSchema, stack);
     }
     return;
@@ -25,15 +27,15 @@ export function* getKnownProperties(
   for (const alternatives of [oneOf, allOf, anyOf]) {
     if (Array.isArray(alternatives)) {
       for (const alternative of alternatives) {
-        if (isSchema(alternative)) {
+        if (isSchemaObject(alternative)) {
           yield* getKnownProperties(alternative, rootSchema, stack);
         }
       }
     }
   }
   if (dependencies !== undefined) {
     for (const dependency of Object.values(dependencies)) {
-      if (!Array.isArray(dependency) && isSchema(dependency)) {
+      if (!Array.isArray(dependency) && isSchemaObject(dependency)) {
         yield* getKnownProperties(dependency, rootSchema, stack);
       }
     }

packages/form/src/core/matching.ts

@@ -3,6 +3,7 @@
 // Modifications made by Roman Krasilnikov.
 
 import { weakMemoize } from "@/lib/memoize.js";
+import { isSchemaObject } from '@/lib/json-schema/index.js'
 
 import {
   getDiscriminatorFieldFromSchema,
@@ -11,7 +12,6 @@ import {
 import type { Merger } from "./merger.js";
 import { resolveAllReferences, retrieveSchema } from "./resolve.js";
 import {
-  isSchema,
   isSchemaWithProperties,
   REF_KEY,
   type Schema,
@@ -158,7 +158,7 @@ export function calculateIndexScore(
             merger,
             rootSchema,
             formValue,
-            altSchemas.filter(isSchema),
+            altSchemas.filter(isSchemaObject),
             -1,
             discriminator
           );