@agentshouse/mdmodel 0.1.0-alpha.6 → 0.1.0-alpha.7

package/dist/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,iBAAiB,CAAC;AAgC7D,wBAAgB,cAAc,CAC5B,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,EAC3C,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACxC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,gBAAgB,GAAG,YAAY,GAAG,YAAY,CAAA;CAAE,GAAG,SAAS,CAgBrF"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,iBAAiB,CAAC;AAkB7D,wBAAgB,cAAc,CAC5B,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,EAC3C,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACxC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,gBAAgB,GAAG,YAAY,GAAG,YAAY,CAAA;CAAE,GAAG,SAAS,CAUrF"}

package/dist/schema.js

@@ -1,14 +1,4 @@
-import { Ajv } from 'ajv';
-import formatsPlugin from 'ajv-formats';
-const addFormats = formatsPlugin;
-const ajv = new Ajv({
-    allErrors: true,
-    strict: false,
-    validateFormats: true
-});
-addFormats(ajv, [
-    'date'
-]);
+import { Validator } from '@cfworker/json-schema';
 function scalarSchema(spec) {
     if (spec.kind === 'string' || spec.kind === 'reference') return {
         type: 'string'
@@ -35,36 +25,24 @@ function fieldSchema(spec) {
     return scalarSchema(spec);
 }
 function ruleFor(error) {
-    if (error.keyword === 'required') return 'required-field';
-    if (error.keyword === 'enum') return 'field-enum';
-    return 'field-kind';
-}
-function locationFor(error) {
-    if (error.keyword === 'required' && typeof error.params.missingProperty === 'string') {
-        return error.params.missingProperty;
-    }
-    const path = error.instancePath.replace(/^\//, '').split('/');
-    return path[0] ?? '';
+    return error.keyword === 'enum' ? 'field-enum' : 'field-kind';
 }
 export function validateFields(fields, values) {
-    const properties = {};
-    const required = [];
     for (const [name, spec] of Object.entries(fields)){
-        properties[name] = fieldSchema(spec);
-        if (spec.required) required.push(name);
+        if (spec.required && values[name] === undefined) return {
+            field: name,
+            rule: 'required-field'
+        };
     }
-    const validate = ajv.compile({
-        type: 'object',
-        properties,
-        required,
-        additionalProperties: true
-    });
-    if (validate(values)) return undefined;
-    const error = validate.errors[0];
-    return {
-        field: locationFor(error),
-        rule: ruleFor(error)
-    };
+    for (const [name, spec] of Object.entries(fields)){
+        if (values[name] === undefined) continue;
+        const result = new Validator(fieldSchema(spec), '2020-12', false).validate(values[name]);
+        if (!result.valid) return {
+            field: name,
+            rule: ruleFor(result.errors[0])
+        };
+    }
+    return undefined;
 }
 
 //# sourceMappingURL=schema.js.map

package/dist/schema.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/workspace/packages/mdmodel/src/schema.ts"],"sourcesContent":["import { Ajv, type ErrorObject } from 'ajv';\nimport formatsPlugin from 'ajv-formats';\nimport type { FieldSpec, ScalarSpec } from './definition.js';\n\nconst addFormats = formatsPlugin as unknown as (validator: Ajv, names?: string[]) => Ajv;\nconst ajv = new Ajv({ allErrors: true, strict: false, validateFormats: true });\naddFormats(ajv, ['date']);\n\nfunction scalarSchema(spec: ScalarSpec): Record<string, unknown> {\n  if (spec.kind === 'string' || spec.kind === 'reference') return { type: 'string' };\n  if (spec.kind === 'number') return { type: 'number' };\n  if (spec.kind === 'date') return { type: 'string', format: 'date' };\n  return { type: 'string', enum: [...spec.values] };\n}\n\nfunction fieldSchema(spec: FieldSpec): Record<string, unknown> {\n  if (spec.kind === 'list') return { type: 'array', items: scalarSchema(spec.of) };\n  return scalarSchema(spec);\n}\n\nfunction ruleFor(error: ErrorObject): 'required-field' | 'field-enum' | 'field-kind' {\n  if (error.keyword === 'required') return 'required-field';\n  if (error.keyword === 'enum') return 'field-enum';\n  return 'field-kind';\n}\n\nfunction locationFor(error: ErrorObject): string {\n  if (error.keyword === 'required' && typeof error.params.missingProperty === 'string') {\n    return error.params.missingProperty;\n  }\n  const path = error.instancePath.replace(/^\\//, '').split('/');\n  return path[0] ?? '';\n}\n\nexport function validateFields(\n  fields: Readonly<Record<string, FieldSpec>>,\n  values: Readonly<Record<string, unknown>>,\n): { field: string; rule: 'required-field' | 'field-enum' | 'field-kind' } | undefined {\n  const properties: Record<string, Record<string, unknown>> = {};\n  const required: string[] = [];\n  for (const [name, spec] of Object.entries(fields)) {\n    properties[name] = fieldSchema(spec);\n    if (spec.required) required.push(name);\n  }\n  const validate = ajv.compile({\n    type: 'object',\n    properties,\n    required,\n    additionalProperties: true,\n  });\n  if (validate(values)) return undefined;\n  const error = validate.errors![0]!;\n  return { field: locationFor(error), rule: ruleFor(error) };\n}\n"],"names":["Ajv","formatsPlugin","addFormats","ajv","allErrors","strict","validateFormats","scalarSchema","spec","kind","type","format","enum","values","fieldSchema","items","of","ruleFor","error","keyword","locationFor","params","missingProperty","path","instancePath","replace","split","validateFields","fields","properties","required","name","Object","entries","push","validate","compile","additionalProperties","undefined","errors","field","rule"],"mappings":"AAAA,SAASA,GAAG,QAA0B,MAAM;AAC5C,OAAOC,mBAAmB,cAAc;AAGxC,MAAMC,aAAaD;AACnB,MAAME,MAAM,IAAIH,IAAI;IAAEI,WAAW;IAAMC,QAAQ;IAAOC,iBAAiB;AAAK;AAC5EJ,WAAWC,KAAK;IAAC;CAAO;AAExB,SAASI,aAAaC,IAAgB;IACpC,IAAIA,KAAKC,IAAI,KAAK,YAAYD,KAAKC,IAAI,KAAK,aAAa,OAAO;QAAEC,MAAM;IAAS;IACjF,IAAIF,KAAKC,IAAI,KAAK,UAAU,OAAO;QAAEC,MAAM;IAAS;IACpD,IAAIF,KAAKC,IAAI,KAAK,QAAQ,OAAO;QAAEC,MAAM;QAAUC,QAAQ;IAAO;IAClE,OAAO;QAAED,MAAM;QAAUE,MAAM;eAAIJ,KAAKK,MAAM;SAAC;IAAC;AAClD;AAEA,SAASC,YAAYN,IAAe;IAClC,IAAIA,KAAKC,IAAI,KAAK,QAAQ,OAAO;QAAEC,MAAM;QAASK,OAAOR,aAAaC,KAAKQ,EAAE;IAAE;IAC/E,OAAOT,aAAaC;AACtB;AAEA,SAASS,QAAQC,KAAkB;IACjC,IAAIA,MAAMC,OAAO,KAAK,YAAY,OAAO;IACzC,IAAID,MAAMC,OAAO,KAAK,QAAQ,OAAO;IACrC,OAAO;AACT;AAEA,SAASC,YAAYF,KAAkB;IACrC,IAAIA,MAAMC,OAAO,KAAK,cAAc,OAAOD,MAAMG,MAAM,CAACC,eAAe,KAAK,UAAU;QACpF,OAAOJ,MAAMG,MAAM,CAACC,eAAe;IACrC;IACA,MAAMC,OAAOL,MAAMM,YAAY,CAACC,OAAO,CAAC,OAAO,IAAIC,KAAK,CAAC;IACzD,OAAOH,IAAI,CAAC,EAAE,IAAI;AACpB;AAEA,OAAO,SAASI,eACdC,MAA2C,EAC3Cf,MAAyC;IAEzC,MAAMgB,aAAsD,CAAC;IAC7D,MAAMC,WAAqB,EAAE;IAC7B,KAAK,MAAM,CAACC,MAAMvB,KAAK,IAAIwB,OAAOC,OAAO,CAACL,QAAS;QACjDC,UAAU,CAACE,KAAK,GAAGjB,YAAYN;QAC/B,IAAIA,KAAKsB,QAAQ,EAAEA,SAASI,IAAI,CAACH;IACnC;IACA,MAAMI,WAAWhC,IAAIiC,OAAO,CAAC;QAC3B1B,MAAM;QACNmB;QACAC;QACAO,sBAAsB;IACxB;IACA,IAAIF,SAAStB,SAAS,OAAOyB;IAC7B,MAAMpB,QAAQiB,SAASI,MAAM,AAAC,CAAC,EAAE;IACjC,OAAO;QAAEC,OAAOpB,YAAYF;QAAQuB,MAAMxB,QAAQC;IAAO;AAC3D"}
+{"version":3,"sources":["/workspace/packages/mdmodel/src/schema.ts"],"sourcesContent":["import { Validator, type OutputUnit } from '@cfworker/json-schema';\nimport type { FieldSpec, ScalarSpec } from './definition.js';\n\nfunction scalarSchema(spec: ScalarSpec): Record<string, unknown> {\n  if (spec.kind === 'string' || spec.kind === 'reference') return { type: 'string' };\n  if (spec.kind === 'number') return { type: 'number' };\n  if (spec.kind === 'date') return { type: 'string', format: 'date' };\n  return { type: 'string', enum: [...spec.values] };\n}\n\nfunction fieldSchema(spec: FieldSpec): Record<string, unknown> {\n  if (spec.kind === 'list') return { type: 'array', items: scalarSchema(spec.of) };\n  return scalarSchema(spec);\n}\n\nfunction ruleFor(error: OutputUnit): 'field-enum' | 'field-kind' {\n  return error.keyword === 'enum' ? 'field-enum' : 'field-kind';\n}\n\nexport function validateFields(\n  fields: Readonly<Record<string, FieldSpec>>,\n  values: Readonly<Record<string, unknown>>,\n): { field: string; rule: 'required-field' | 'field-enum' | 'field-kind' } | undefined {\n  for (const [name, spec] of Object.entries(fields)) {\n    if (spec.required && values[name] === undefined) return { field: name, rule: 'required-field' };\n  }\n  for (const [name, spec] of Object.entries(fields)) {\n    if (values[name] === undefined) continue;\n    const result = new Validator(fieldSchema(spec), '2020-12', false).validate(values[name]);\n    if (!result.valid) return { field: name, rule: ruleFor(result.errors[0]!) };\n  }\n  return undefined;\n}\n"],"names":["Validator","scalarSchema","spec","kind","type","format","enum","values","fieldSchema","items","of","ruleFor","error","keyword","validateFields","fields","name","Object","entries","required","undefined","field","rule","result","validate","valid","errors"],"mappings":"AAAA,SAASA,SAAS,QAAyB,wBAAwB;AAGnE,SAASC,aAAaC,IAAgB;IACpC,IAAIA,KAAKC,IAAI,KAAK,YAAYD,KAAKC,IAAI,KAAK,aAAa,OAAO;QAAEC,MAAM;IAAS;IACjF,IAAIF,KAAKC,IAAI,KAAK,UAAU,OAAO;QAAEC,MAAM;IAAS;IACpD,IAAIF,KAAKC,IAAI,KAAK,QAAQ,OAAO;QAAEC,MAAM;QAAUC,QAAQ;IAAO;IAClE,OAAO;QAAED,MAAM;QAAUE,MAAM;eAAIJ,KAAKK,MAAM;SAAC;IAAC;AAClD;AAEA,SAASC,YAAYN,IAAe;IAClC,IAAIA,KAAKC,IAAI,KAAK,QAAQ,OAAO;QAAEC,MAAM;QAASK,OAAOR,aAAaC,KAAKQ,EAAE;IAAE;IAC/E,OAAOT,aAAaC;AACtB;AAEA,SAASS,QAAQC,KAAiB;IAChC,OAAOA,MAAMC,OAAO,KAAK,SAAS,eAAe;AACnD;AAEA,OAAO,SAASC,eACdC,MAA2C,EAC3CR,MAAyC;IAEzC,KAAK,MAAM,CAACS,MAAMd,KAAK,IAAIe,OAAOC,OAAO,CAACH,QAAS;QACjD,IAAIb,KAAKiB,QAAQ,IAAIZ,MAAM,CAACS,KAAK,KAAKI,WAAW,OAAO;YAAEC,OAAOL;YAAMM,MAAM;QAAiB;IAChG;IACA,KAAK,MAAM,CAACN,MAAMd,KAAK,IAAIe,OAAOC,OAAO,CAACH,QAAS;QACjD,IAAIR,MAAM,CAACS,KAAK,KAAKI,WAAW;QAChC,MAAMG,SAAS,IAAIvB,UAAUQ,YAAYN,OAAO,WAAW,OAAOsB,QAAQ,CAACjB,MAAM,CAACS,KAAK;QACvF,IAAI,CAACO,OAAOE,KAAK,EAAE,OAAO;YAAEJ,OAAOL;YAAMM,MAAMX,QAAQY,OAAOG,MAAM,CAAC,EAAE;QAAG;IAC5E;IACA,OAAON;AACT"}

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.1.0-alpha.6";
+export declare const VERSION = "0.1.0-alpha.7";
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -1,3 +1,3 @@
-export const VERSION = '0.1.0-alpha.6';
+export const VERSION = '0.1.0-alpha.7';
 
 //# sourceMappingURL=version.js.map

package/dist/version.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/workspace/packages/mdmodel/src/version.ts"],"sourcesContent":["export const VERSION = '0.1.0-alpha.6';\n"],"names":["VERSION"],"mappings":"AAAA,OAAO,MAAMA,UAAU,gBAAgB"}
+{"version":3,"sources":["/workspace/packages/mdmodel/src/version.ts"],"sourcesContent":["export const VERSION = '0.1.0-alpha.7';\n"],"names":["VERSION"],"mappings":"AAAA,OAAO,MAAMA,UAAU,gBAAgB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/mdmodel",
-  "version": "0.1.0-alpha.6",
+  "version": "0.1.0-alpha.7",
   "description": "MD Type language, parser, validator, structured change application, Markdown syntax profile, and conformance fixtures",
   "license": "MIT",
   "type": "module",
@@ -35,7 +35,6 @@
     "url": "https://github.com/agentshouse/mdmodel/issues"
   },
   "dependencies": {
-    "ajv": "8.17.1",
-    "ajv-formats": "3.0.1"
+    "@cfworker/json-schema": "4.1.1"
   }
 }