@atproto/lexicon 0.2.0 → 0.2.2

package/package.json

@@ -1,35 +1,31 @@
 {
   "name": "@atproto/lexicon",
-  "version": "0.2.0",
-  "main": "dist/index.js",
-  "scripts": {
-    "test": "jest",
-    "prettier": "prettier --check src/ tests/",
-    "prettier:fix": "prettier --write src/ tests/",
-    "lint": "eslint . --ext .ts,.tsx",
-    "lint:fix": "yarn lint --fix",
-    "verify": "run-p prettier lint",
-    "verify:fix": "yarn prettier:fix && yarn lint:fix",
-    "build": "node ./build.js",
-    "postbuild": "tsc --build tsconfig.build.json",
-    "update-main-to-dist": "node ./update-pkg.js --update-main-to-dist",
-    "update-main-to-src": "node ./update-pkg.js --update-main-to-src",
-    "prepublish": "npm run update-main-to-dist",
-    "postpublish": "npm run update-main-to-src"
-  },
+  "version": "0.2.2",
   "license": "MIT",
+  "description": "atproto Lexicon schema language library",
+  "keywords": [
+    "atproto",
+    "lexicon"
+  ],
+  "homepage": "https://atproto.com",
   "repository": {
     "type": "git",
-    "url": "https://github.com/bluesky-social/atproto.git",
+    "url": "https://github.com/bluesky-social/atproto",
     "directory": "packages/lexicon"
   },
+  "main": "dist/index.js",
   "dependencies": {
-    "@atproto/common-web": "*",
-    "@atproto/identifier": "*",
-    "@atproto/nsid": "*",
-    "@atproto/uri": "*",
     "iso-datestring-validator": "^2.2.2",
-    "multiformats": "^9.6.4",
-    "zod": "^3.21.4"
-  }
-}
+    "multiformats": "^9.9.0",
+    "zod": "^3.21.4",
+    "@atproto/common-web": "^0.2.1",
+    "@atproto/syntax": "^0.1.2"
+  },
+  "scripts": {
+    "test": "jest",
+    "build": "node ./build.js",
+    "postbuild": "tsc --build tsconfig.build.json",
+    "update-main-to-dist": "node ../../update-main-to-dist.js packages/lexicon"
+  },
+  "types": "dist/index.d.ts"
+}

package/src/types.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { NSID } from '@atproto/nsid'
+import { NSID } from '@atproto/syntax'
 import { requiredPropertiesRefinement } from './util'
 
 // primitives
@@ -173,11 +173,9 @@ export const lexObject = z
     description: z.string().optional(),
     required: z.string().array().optional(),
     nullable: z.string().array().optional(),
-    properties: z
-      .record(
-        z.union([lexRefVariant, lexIpldType, lexArray, lexBlob, lexPrimitive]),
-      )
-      .optional(),
+    properties: z.record(
+      z.union([lexRefVariant, lexIpldType, lexArray, lexBlob, lexPrimitive]),
+    ),
   })
   .strict()
   .superRefine(requiredPropertiesRefinement)

package/src/validators/formats.ts

@@ -1,9 +1,12 @@
-import { ensureValidAtUri } from '@atproto/uri'
 import { isValidISODateString } from 'iso-datestring-validator'
 import { CID } from 'multiformats/cid'
 import { ValidationResult, ValidationError } from '../types'
-import { ensureValidDid, ensureValidHandle } from '@atproto/identifier'
-import { ensureValidNsid } from '@atproto/nsid'
+import {
+  ensureValidDid,
+  ensureValidHandle,
+  ensureValidNsid,
+  ensureValidAtUri,
+} from '@atproto/syntax'
 import { validateLanguage } from '@atproto/common-web'
 
 export function datetime(path: string, value: string): ValidationResult {

package/tests/general.test.ts

@@ -1,6 +1,5 @@
 import { CID } from 'multiformats/cid'
 import { lexiconDoc, Lexicons } from '../src/index'
-import { object } from '../src/validators/complex'
 import LexiconDocs from './_scaffolds/lexicons'
 
 describe('Lexicons collection', () => {

package/tsconfig.build.json

@@ -1,4 +1,4 @@
 {
   "extends": "./tsconfig.json",
   "exclude": ["**/*.spec.ts", "**/*.test.ts"]
-}
+}

package/tsconfig.json

@@ -11,4 +11,4 @@
     { "path": "../nsid/tsconfig.build.json" },
     { "path": "../uri/tsconfig.build.json" }
   ]
-}
+}

package/dist/src/index.d.ts

@@ -1,2 +0,0 @@
-export * from './types';
-export * from './lexicons';

package/dist/src/lexicons.d.ts

@@ -1,15 +0,0 @@
-import { LexiconDoc, LexUserType } from './types';
-export declare class Lexicons {
-    docs: Map<string, LexiconDoc>;
-    defs: Map<string, LexUserType>;
-    constructor(docs?: unknown[]);
-    add(doc: unknown): void;
-    remove(uri: string): void;
-    get(uri: string): LexiconDoc | undefined;
-    getDef(uri: string): LexUserType | undefined;
-    getDefOrThrow(uri: string, types?: string[]): LexUserType;
-    assertValidRecord(lexUri: string, value: unknown): void;
-    assertValidXrpcParams(lexUri: string, value: unknown): void;
-    assertValidXrpcInput(lexUri: string, value: unknown): void;
-    assertValidXrpcOutput(lexUri: string, value: unknown): void;
-}

package/dist/src/record/index.d.ts

@@ -1,4 +0,0 @@
-export * from './schema';
-export * from './schemas';
-export * from './validator';
-export * from './validation';

package/dist/src/record/schema.d.ts

@@ -1,9 +0,0 @@
-import { ValidateFunction } from 'ajv';
-import { RecordSchema } from '../types';
-export declare class CompiledRecordSchema {
-    def: RecordSchema;
-    id: string;
-    validate?: ValidateFunction;
-    constructor(def: RecordSchema);
-}
-export default CompiledRecordSchema;

package/dist/src/record/schemas.d.ts

@@ -1,10 +0,0 @@
-import CompiledRecordSchema from './schema';
-import RecordValidator, { RecordValidatorDescription } from './validator';
-export declare class RecordSchemas {
-    schemas: Map<string, CompiledRecordSchema>;
-    add(schemaDef: unknown): void;
-    remove(key: string): void;
-    get(key: string): CompiledRecordSchema | undefined;
-    createRecordValidator(desc: string | string[] | RecordValidatorDescription): RecordValidator;
-}
-export default RecordSchemas;

package/dist/src/record/util.d.ts

@@ -1 +0,0 @@
-export declare const isRecord: (obj: unknown) => obj is Record<string, unknown>;

package/dist/src/record/validation.d.ts

@@ -1,24 +0,0 @@
-import { ValidateFunction } from 'ajv';
-import CompiledRecordSchema from './schema';
-export declare class ValidationError extends Error {
-    code: ValidationResultCode;
-    messages: string[];
-    constructor(res: ValidationResult);
-}
-export declare enum ValidationResultCode {
-    Full = "full",
-    Partial = "partial",
-    Incompatible = "incompatible",
-    Invalid = "invalid"
-}
-export declare class ValidationResult {
-    code: ValidationResultCode;
-    error: string | undefined;
-    fallbacks: string[];
-    messages: string[];
-    get valid(): boolean;
-    get fullySupported(): boolean;
-    get compatible(): boolean;
-    _t(to: ValidationResultCode, message?: string): void;
-    _fail(schema: CompiledRecordSchema, validator: ValidateFunction): void;
-}

package/dist/src/record/validator.d.ts

@@ -1,17 +0,0 @@
-import CompiledRecordSchema from './schema';
-import RecordSchemas from './schemas';
-import { ValidationResult } from './validation';
-export interface RecordValidatorDescription {
-    type: string | string[];
-    ext?: string | string[];
-}
-export declare class RecordValidator {
-    private schemas;
-    type: CompiledRecordSchema[];
-    ext: CompiledRecordSchema[];
-    constructor(schemas: RecordSchemas, type: CompiledRecordSchema[], ext: CompiledRecordSchema[]);
-    validate(value: unknown): ValidationResult;
-    isValid(value: unknown): boolean;
-    assertValid(value: unknown): ValidationResult;
-}
-export default RecordValidator;