@atproto/lexicon 0.6.2 → 0.7.0-next.0

package/dist/validators/xrpc.js

@@ -1,43 +1,7 @@
-"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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.params = params;
-const types_1 = require("../types");
-const complex_1 = require("./complex");
-const PrimitiveValidators = __importStar(require("./primitives"));
-function params(lexicons, path, def, val) {
+import { ValidationError, } from '../types.js';
+import { array } from './complex.js';
+import * as PrimitiveValidators from './primitives.js';
+export function params(lexicons, path, def, val) {
     // type
     const value = val && typeof val === 'object' ? val : {};
     const requiredProps = new Set(def.required ?? []);
@@ -47,7 +11,7 @@ function params(lexicons, path, def, val) {
         for (const key in def.properties) {
             const propDef = def.properties[key];
             const validated = propDef.type === 'array'
-                ? (0, complex_1.array)(lexicons, key, propDef, value[key])
+                ? array(lexicons, key, propDef, value[key])
                 : PrimitiveValidators.validate(lexicons, key, propDef, value[key]);
             const propValue = validated.success ? validated.value : value[key];
             const propIsUndefined = typeof propValue === 'undefined';
@@ -55,7 +19,7 @@ function params(lexicons, path, def, val) {
             if (propIsUndefined && requiredProps.has(key)) {
                 return {
                     success: false,
-                    error: new types_1.ValidationError(`${path} must have the property "${key}"`),
+                    error: new ValidationError(`${path} must have the property "${key}"`),
                 };
             }
             else if (!propIsUndefined && !validated.success) {

package/dist/validators/xrpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"xrpc.js","sourceRoot":"","sources":["../../src/validators/xrpc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,wBA2CC;AA/CD,oCAA+E;AAC/E,uCAAiC;AACjC,kEAAmD;AAEnD,SAAgB,MAAM,CACpB,QAAkB,EAClB,IAAY,EACZ,GAAsB,EACtB,GAAY;IAEZ,OAAO;IACP,MAAM,KAAK,GAAG,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;IAEvD,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAA;IAEjD,aAAa;IACb,IAAI,WAAW,GAAG,KAAgC,CAAA;IAClD,IAAI,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QACvC,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YACjC,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;YACnC,MAAM,SAAS,GACb,OAAO,CAAC,IAAI,KAAK,OAAO;gBACtB,CAAC,CAAC,IAAA,eAAK,EAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC3C,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;YACtE,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClE,MAAM,eAAe,GAAG,OAAO,SAAS,KAAK,WAAW,CAAA;YACxD,mEAAmE;YACnE,IAAI,eAAe,IAAI,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC9C,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,IAAI,uBAAe,CAAC,GAAG,IAAI,4BAA4B,GAAG,GAAG,CAAC;iBACtE,CAAA;YACH,CAAC;iBAAM,IAAI,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;gBAClD,OAAO,SAAS,CAAA;YAClB,CAAC;YACD,8FAA8F;YAC9F,IAAI,SAAS,KAAK,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC7B,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;oBAC1B,qBAAqB;oBACrB,WAAW,GAAG,EAAE,GAAG,KAAK,EAAE,CAAA;gBAC5B,CAAC;gBACD,WAAW,CAAC,GAAG,CAAC,GAAG,SAAS,CAAA;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;AAC9C,CAAC","sourcesContent":["import { Lexicons } from '../lexicons'\nimport { LexXrpcParameters, ValidationError, ValidationResult } from '../types'\nimport { array } from './complex'\nimport * as PrimitiveValidators from './primitives'\n\nexport function params(\n  lexicons: Lexicons,\n  path: string,\n  def: LexXrpcParameters,\n  val: unknown,\n): ValidationResult<Record<string, unknown>> {\n  // type\n  const value = val && typeof val === 'object' ? val : {}\n\n  const requiredProps = new Set(def.required ?? [])\n\n  // properties\n  let resultValue = value as Record<string, unknown>\n  if (typeof def.properties === 'object') {\n    for (const key in def.properties) {\n      const propDef = def.properties[key]\n      const validated =\n        propDef.type === 'array'\n          ? array(lexicons, key, propDef, value[key])\n          : PrimitiveValidators.validate(lexicons, key, propDef, value[key])\n      const propValue = validated.success ? validated.value : value[key]\n      const propIsUndefined = typeof propValue === 'undefined'\n      // Return error for bad validation, giving required rule precedence\n      if (propIsUndefined && requiredProps.has(key)) {\n        return {\n          success: false,\n          error: new ValidationError(`${path} must have the property \"${key}\"`),\n        }\n      } else if (!propIsUndefined && !validated.success) {\n        return validated\n      }\n      // Adjust value based on e.g. applied defaults, cloning shallowly if there was a changed value\n      if (propValue !== value[key]) {\n        if (resultValue === value) {\n          // Lazy shallow clone\n          resultValue = { ...value }\n        }\n        resultValue[key] = propValue\n      }\n    }\n  }\n\n  return { success: true, value: resultValue }\n}\n"]}
+{"version":3,"file":"xrpc.js","sourceRoot":"","sources":["../../src/validators/xrpc.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,GAEhB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AACpC,OAAO,KAAK,mBAAmB,MAAM,iBAAiB,CAAA;AAEtD,MAAM,UAAU,MAAM,CACpB,QAAkB,EAClB,IAAY,EACZ,GAAsB,EACtB,GAAY;IAEZ,OAAO;IACP,MAAM,KAAK,GAAG,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;IAEvD,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAA;IAEjD,aAAa;IACb,IAAI,WAAW,GAAG,KAAgC,CAAA;IAClD,IAAI,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QACvC,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YACjC,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;YACnC,MAAM,SAAS,GACb,OAAO,CAAC,IAAI,KAAK,OAAO;gBACtB,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC3C,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;YACtE,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClE,MAAM,eAAe,GAAG,OAAO,SAAS,KAAK,WAAW,CAAA;YACxD,mEAAmE;YACnE,IAAI,eAAe,IAAI,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC9C,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,IAAI,eAAe,CAAC,GAAG,IAAI,4BAA4B,GAAG,GAAG,CAAC;iBACtE,CAAA;YACH,CAAC;iBAAM,IAAI,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;gBAClD,OAAO,SAAS,CAAA;YAClB,CAAC;YACD,8FAA8F;YAC9F,IAAI,SAAS,KAAK,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC7B,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;oBAC1B,qBAAqB;oBACrB,WAAW,GAAG,EAAE,GAAG,KAAK,EAAE,CAAA;gBAC5B,CAAC;gBACD,WAAW,CAAC,GAAG,CAAC,GAAG,SAAS,CAAA;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;AAC9C,CAAC","sourcesContent":["import { Lexicons } from '../lexicons.js'\nimport {\n  LexXrpcParameters,\n  ValidationError,\n  ValidationResult,\n} from '../types.js'\nimport { array } from './complex.js'\nimport * as PrimitiveValidators from './primitives.js'\n\nexport function params(\n  lexicons: Lexicons,\n  path: string,\n  def: LexXrpcParameters,\n  val: unknown,\n): ValidationResult<Record<string, unknown>> {\n  // type\n  const value = val && typeof val === 'object' ? val : {}\n\n  const requiredProps = new Set(def.required ?? [])\n\n  // properties\n  let resultValue = value as Record<string, unknown>\n  if (typeof def.properties === 'object') {\n    for (const key in def.properties) {\n      const propDef = def.properties[key]\n      const validated =\n        propDef.type === 'array'\n          ? array(lexicons, key, propDef, value[key])\n          : PrimitiveValidators.validate(lexicons, key, propDef, value[key])\n      const propValue = validated.success ? validated.value : value[key]\n      const propIsUndefined = typeof propValue === 'undefined'\n      // Return error for bad validation, giving required rule precedence\n      if (propIsUndefined && requiredProps.has(key)) {\n        return {\n          success: false,\n          error: new ValidationError(`${path} must have the property \"${key}\"`),\n        }\n      } else if (!propIsUndefined && !validated.success) {\n        return validated\n      }\n      // Adjust value based on e.g. applied defaults, cloning shallowly if there was a changed value\n      if (propValue !== value[key]) {\n        if (resultValue === value) {\n          // Lazy shallow clone\n          resultValue = { ...value }\n        }\n        resultValue[key] = propValue\n      }\n    }\n  }\n\n  return { success: true, value: resultValue }\n}\n"]}

package/{jest.config.js → jest.config.cjs}

@@ -1,7 +1,14 @@
 /** @type {import('jest').Config} */
 module.exports = {
   displayName: 'Lexicon',
-  transform: { '^.+\\.ts$': '@swc/jest' },
+  transform: {
+    '^.+\\.(t|j)s$': [
+      '@swc/jest',
+      { jsc: { transform: {} }, module: { type: 'es6' } },
+    ],
+  },
+  extensionsToTreatAsEsm: ['.ts'],
+  transformIgnorePatterns: [],
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
   moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }

package/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@atproto/lexicon",
-  "version": "0.6.2",
+  "version": "0.7.0-next.0",
+  "engines": {
+    "node": ">=22"
+  },
   "license": "MIT",
   "description": "atproto Lexicon schema language library",
   "keywords": [
@@ -13,21 +16,26 @@
     "url": "https://github.com/bluesky-social/atproto",
     "directory": "packages/lexicon"
   },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "dependencies": {
     "iso-datestring-validator": "^2.2.2",
-    "multiformats": "^9.9.0",
+    "multiformats": "^13.0.0",
     "zod": "^3.23.8",
-    "@atproto/common-web": "^0.4.18",
-    "@atproto/syntax": "^0.5.0"
+    "@atproto/syntax": "^0.6.0-next.0",
+    "@atproto/common-web": "^0.5.0-next.0"
   },
   "devDependencies": {
-    "jest": "^28.1.2",
-    "typescript": "^5.6.3"
+    "jest": "^30.0.0",
+    "typescript": "^6.0.3"
+  },
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
   },
   "scripts": {
-    "test": "jest",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest",
     "build": "tsc --build tsconfig.build.json"
   }
 }

package/src/index.ts

@@ -1,4 +1,4 @@
-export * from './types'
-export * from './lexicons'
-export * from './blob-refs'
-export * from './serialize'
+export * from './types.js'
+export * from './lexicons.js'
+export * from './blob-refs.js'
+export * from './serialize.js'

package/src/lexicons.ts

@@ -7,16 +7,16 @@ import {
   ValidationError,
   ValidationResult,
   isObj,
-} from './types'
-import { toLexUri } from './util'
+} from './types.js'
+import { toLexUri } from './util.js'
 import {
   assertValidRecord,
   assertValidXrpcInput,
   assertValidXrpcMessage,
   assertValidXrpcOutput,
   assertValidXrpcParams,
-} from './validation'
-import { object as validateObject } from './validators/complex'
+} from './validation.js'
+import { object as validateObject } from './validators/complex.js'
 
 /**
  * A collection of compiled lexicons.

package/src/serialize.ts

@@ -6,7 +6,7 @@ import {
   ipldToJson,
   jsonToIpld,
 } from '@atproto/common-web'
-import { BlobRef, jsonBlobRef } from './blob-refs'
+import { BlobRef, jsonBlobRef } from './blob-refs.js'
 
 /**
  * @note this is equivalent to `unknown` because of {@link IpldValue} being `unknown`.

package/src/types.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod'
 import { validateLanguage } from '@atproto/common-web'
 import { isValidNsid } from '@atproto/syntax'
-import { requiredPropertiesRefinement } from './util'
+import { requiredPropertiesRefinement } from './util.js'
 
 export const languageSchema = z
   .string()

package/src/validation.ts

@@ -1,4 +1,4 @@
-import { Lexicons } from './lexicons'
+import { Lexicons } from './lexicons.js'
 import {
   LexRecord,
   LexRefVariant,
@@ -6,9 +6,9 @@ import {
   LexXrpcProcedure,
   LexXrpcQuery,
   LexXrpcSubscription,
-} from './types'
-import { object, validateOneOf } from './validators/complex'
-import { params } from './validators/xrpc'
+} from './types.js'
+import { object, validateOneOf } from './validators/complex.js'
+import { params } from './validators/xrpc.js'
 
 export function assertValidRecord(
   lexicons: Lexicons,

package/src/validators/blob.ts

@@ -1,6 +1,6 @@
-import { BlobRef } from '../blob-refs'
-import { Lexicons } from '../lexicons'
-import { LexUserType, ValidationError, ValidationResult } from '../types'
+import { BlobRef } from '../blob-refs.js'
+import { Lexicons } from '../lexicons.js'
+import { LexUserType, ValidationError, ValidationResult } from '../types.js'
 
 export function blob(
   lexicons: Lexicons,

package/src/validators/complex.ts

@@ -1,4 +1,4 @@
-import { Lexicons } from '../lexicons'
+import { Lexicons } from '../lexicons.js'
 import {
   LexArray,
   LexRefVariant,
@@ -7,10 +7,10 @@ import {
   ValidationResult,
   isDiscriminatedObject,
   isObj,
-} from '../types'
-import { toLexUri } from '../util'
-import { blob } from './blob'
-import { validate as validatePrimitive } from './primitives'
+} from '../types.js'
+import { toLexUri } from '../util.js'
+import { blob } from './blob.js'
+import { validate as validatePrimitive } from './primitives.js'
 
 export function validate(
   lexicons: Lexicons,

package/src/validators/formats.ts

@@ -1,4 +1,5 @@
-import { isValidISODateString } from 'iso-datestring-validator'
+import isoDatestringValidator from 'iso-datestring-validator'
+const { isValidISODateString } = isoDatestringValidator
 import { CID } from 'multiformats/cid'
 import { validateLanguage } from '@atproto/common-web'
 import {
@@ -10,7 +11,7 @@ import {
   isValidTid,
   isValidUri,
 } from '@atproto/syntax'
-import { ValidationError, ValidationResult } from '../types'
+import { ValidationError, ValidationResult } from '../types.js'
 
 export function datetime(path: string, value: string): ValidationResult {
   try {

package/src/validators/primitives.ts

@@ -1,6 +1,6 @@
 import { CID } from 'multiformats/cid'
 import { graphemeLen, utf8Len } from '@atproto/common-web'
-import { Lexicons } from '../lexicons'
+import { Lexicons } from '../lexicons.js'
 import {
   LexBoolean,
   LexBytes,
@@ -9,8 +9,8 @@ import {
   LexUserType,
   ValidationError,
   ValidationResult,
-} from '../types'
-import * as formats from './formats'
+} from '../types.js'
+import * as formats from './formats.js'
 
 export function validate(
   lexicons: Lexicons,

package/src/validators/xrpc.ts

@@ -1,7 +1,11 @@
-import { Lexicons } from '../lexicons'
-import { LexXrpcParameters, ValidationError, ValidationResult } from '../types'
-import { array } from './complex'
-import * as PrimitiveValidators from './primitives'
+import { Lexicons } from '../lexicons.js'
+import {
+  LexXrpcParameters,
+  ValidationError,
+  ValidationResult,
+} from '../types.js'
+import { array } from './complex.js'
+import * as PrimitiveValidators from './primitives.js'
 
 export function params(
   lexicons: Lexicons,

package/tests/_scaffolds/lexicons.ts

@@ -1,4 +1,4 @@
-import { LexiconDoc } from '../../src/index'
+import { LexiconDoc } from '../../src/index.js'
 
 const lexicons: LexiconDoc[] = [
   {

package/tests/general.test.ts

@@ -1,6 +1,7 @@
+import assert from 'node:assert'
 import { CID } from 'multiformats/cid'
-import { LexiconDoc, Lexicons, parseLexiconDoc } from '../src/index'
-import LexiconDocs from './_scaffolds/lexicons'
+import { LexiconDoc, Lexicons, parseLexiconDoc } from '../src/index.js'
+import LexiconDocs from './_scaffolds/lexicons.js'
 
 describe('Lexicons collection', () => {
   const lex = new Lexicons(LexiconDocs)
@@ -79,9 +80,8 @@ describe('General validation', () => {
     }
     {
       const res = lex.validate('com.example.kitchenSink#object', {})
-      expect(res.success).toBe(false)
-      if (res.success) throw new Error('Asserted')
-      expect(res.error?.message).toBe('Object must have the property "object"')
+      assert(!res.success)
+      expect(res.error.message).toBe('Object must have the property "object"')
     }
   })
   it('fails when a required property is missing', () => {

package/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/blob-refs.ts","./src/index.ts","./src/lexicons.ts","./src/serialize.ts","./src/types.ts","./src/util.ts","./src/validation.ts","./src/validators/blob.ts","./src/validators/complex.ts","./src/validators/formats.ts","./src/validators/primitives.ts","./src/validators/xrpc.ts"],"version":"5.8.2"}
+{"root":["./src/blob-refs.ts","./src/index.ts","./src/lexicons.ts","./src/serialize.ts","./src/types.ts","./src/util.ts","./src/validation.ts","./src/validators/blob.ts","./src/validators/complex.ts","./src/validators/formats.ts","./src/validators/primitives.ts","./src/validators/xrpc.ts"],"version":"6.0.3"}