@atcute/lexicons 1.2.5 → 1.2.7

package/lib/validations/index.ts

@@ -1,23 +1,15 @@
-import type { StandardSchemaV1 } from '@standard-schema/spec';
+import { isUtf8LengthInRange } from '@atcute/uint8array';
+import { isGraphemeLengthInRange } from '@atcute/util-text';
 
-import * as syntax from '../syntax/index.js';
+import type { StandardSchemaV1 } from '@standard-schema/spec';
 
 import { _isBytesWrapper } from '../interfaces/bytes.js';
 import * as interfaces from '../interfaces/index.js';
-
+import * as syntax from '../syntax/index.js';
 import type { $type } from '../types/brand.js';
-
 import { assert } from '../utils.js';
 
-import {
-	allowsEval,
-	getGraphemeLength,
-	getUtf8Length,
-	isArray,
-	isObject,
-	lazy,
-	lazyProperty,
-} from './utils.js';
+import { allowsEval, isArray, isObject, lazy, lazyProperty } from './utils.js';
 
 /**
  * flag indicating whether xrpc schema generation helpers are used. set to true
@@ -523,8 +515,9 @@ export const literal = <T extends Literal>(value: T): LiteralSchema<T> => {
 	};
 };
 
-export interface LiteralEnumSchema<TEnums extends readonly Literal[] = []>
-	extends BaseSchema<TEnums[number]> {
+export interface LiteralEnumSchema<TEnums extends readonly Literal[] = []> extends BaseSchema<
+	TEnums[number]
+> {
 	readonly type: 'literal_enum';
 	readonly expected: TEnums;
 }
@@ -635,8 +628,10 @@ export const integer = (): IntegerSchema => {
 
 // #region Integer constraints
 
-export interface IntegerRangeConstraint<TMin extends number = number, TMax extends number = number>
-	extends BaseConstraint<number> {
+export interface IntegerRangeConstraint<
+	TMin extends number = number,
+	TMax extends number = number,
+> extends BaseConstraint<number> {
 	readonly type: 'integer_range';
 	readonly min: TMin;
 	readonly max: TMax;
@@ -700,8 +695,9 @@ export interface StringSchema<T extends string = string> extends BaseSchema<T> {
 	readonly format: null;
 }
 
-export interface FormattedStringSchema<TFormat extends keyof StringFormatMap = keyof StringFormatMap>
-	extends BaseSchema<StringFormatMap[TFormat]> {
+export interface FormattedStringSchema<
+	TFormat extends keyof StringFormatMap = keyof StringFormatMap,
+> extends BaseSchema<StringFormatMap[TFormat]> {
 	readonly type: 'string';
 	readonly format: TFormat;
 }
@@ -821,29 +817,7 @@ export const stringLength: {
 		minLength: minLength,
 		maxLength: maxLength,
 		'~run'(input, _flags) {
-			// UTF-8 conversion can be expensive, so we're going to do some safe naive
-			// checks where we assume an upper-bound of the UTF-16 to UTF-8 conversion
-
-			const utf16Len = input.length;
-			const maybeUtf8Len = utf16Len * 3;
-
-			// fail early if estimated upper bound is too small
-			if (maybeUtf8Len < minLength) {
-				return issue;
-			}
-
-			// skip calculation if UTF-16 length already satisfies both constraints
-			if (utf16Len >= minLength && maybeUtf8Len <= maxLength) {
-				return undefined;
-			}
-
-			const utf8Len = getUtf8Length(input);
-
-			if (utf8Len < minLength) {
-				return issue;
-			}
-
-			if (utf8Len > maxLength) {
+			if (!isUtf8LengthInRange(input, minLength, maxLength)) {
 				return issue;
 			}
 
@@ -885,29 +859,7 @@ export const stringGraphemes: {
 		minGraphemes: minGraphemes,
 		maxGraphemes: maxGraphemes,
 		'~run'(input, _flags) {
-			// grapheme conversion is expensive, so we're going to do some safe naive
-			// checks where we assume 1 UTF-16 character = 1 grapheme.
-
-			const utf16Len = input.length;
-
-			// fail early if UTF-16 length is too small
-			if (utf16Len < minGraphemes) {
-				return issue;
-			}
-
-			// if there is no minimum bounds, we can safely skip when UTF-16 is
-			// within the maximum bounds.
-			if (minGraphemes === 0 && utf16Len <= maxGraphemes) {
-				return undefined;
-			}
-
-			const graphemeLen = getGraphemeLength(input);
-
-			if (graphemeLen < minGraphemes) {
-				return issue;
-			}
-
-			if (graphemeLen > maxGraphemes) {
+			if (!isGraphemeLengthInRange(input, minGraphemes, maxGraphemes)) {
 				return issue;
 			}
 
@@ -1002,8 +954,10 @@ export const bytes = (): BytesSchema => {
 };
 
 // #region IPLD bytes constraint
-export interface BytesSizeConstraint<TMinLength extends number = number, TMaxLength extends number = number>
-	extends BaseConstraint<interfaces.Bytes> {
+export interface BytesSizeConstraint<
+	TMinLength extends number = number,
+	TMaxLength extends number = number,
+> extends BaseConstraint<interfaces.Bytes> {
 	readonly type: 'bytes_size';
 	readonly minSize: TMinLength;
 	readonly maxSize: TMaxLength;
@@ -1101,8 +1055,10 @@ export const cidLink = (): CidLinkSchema => {
 
 // #region Nullable schema
 
-export interface NullableSchema<TItem extends BaseSchema = BaseSchema>
-	extends BaseSchema<InferInput<TItem> | null, InferOutput<TItem> | null> {
+export interface NullableSchema<TItem extends BaseSchema = BaseSchema> extends BaseSchema<
+	InferInput<TItem> | null,
+	InferOutput<TItem> | null
+> {
 	readonly type: 'nullable';
 	readonly wrapped: TItem;
 }
@@ -1268,8 +1224,10 @@ export const array = <TItem extends BaseSchema>(item: TItem | (() => TItem)): Ar
 
 // #region Array constraints
 
-export interface ArrayLengthConstraint<TMinLength extends number = number, TMaxLength extends number = number>
-	extends BaseConstraint<unknown[]> {
+export interface ArrayLengthConstraint<
+	TMinLength extends number = number,
+	TMaxLength extends number = number,
+> extends BaseConstraint<unknown[]> {
 	readonly type: 'array_length';
 	readonly minLength: TMinLength;
 	readonly maxLength: TMaxLength;
@@ -1360,8 +1318,9 @@ type InferObjectOutput<TShape extends ObjectShape> = Flatten<
 	}
 >;
 
-export interface ObjectSchema<TShape extends LooseObjectShape = LooseObjectShape>
-	extends BaseSchema<Record<string, unknown>> {
+export interface ObjectSchema<TShape extends LooseObjectShape = LooseObjectShape> extends BaseSchema<
+	Record<string, unknown>
+> {
 	readonly type: 'object';
 	readonly shape: Readonly<TShape>;
 
@@ -1594,8 +1553,9 @@ export type RecordObjectShape = {
 export type RecordKeySchema = StringSchema | FormattedStringSchema | LiteralSchema<string>;
 export type RecordObjectSchema = ObjectSchema<RecordObjectShape>;
 
-export interface RecordSchema<TObject extends ObjectSchema, TKey extends RecordKeySchema>
-	extends BaseSchema<Record<string, unknown>> {
+export interface RecordSchema<TObject extends ObjectSchema, TKey extends RecordKeySchema> extends BaseSchema<
+	Record<string, unknown>
+> {
 	readonly type: 'record';
 	readonly key: TKey;
 	readonly object: TObject;

package/lib/validations/utils.ts

@@ -1,75 +1,3 @@
-const segmenter = new Intl.Segmenter();
-
-export const getUtf8Length = (str: string): number => {
-	const len = str.length;
-
-	let u16pos = 0;
-	let u8pos = 0;
-
-	jump: if (str.charCodeAt(0) < 0x80) {
-		u16pos++;
-		u8pos++;
-
-		while (u16pos + 3 < len) {
-			const a = str.charCodeAt(u16pos);
-			const b = str.charCodeAt(u16pos + 1);
-			const c = str.charCodeAt(u16pos + 2);
-			const d = str.charCodeAt(u16pos + 3);
-
-			if ((a | b | c | d) >= 0x80) {
-				break jump;
-			}
-
-			u16pos += 4;
-			u8pos += 4;
-		}
-
-		while (u16pos < len) {
-			const x = str.charCodeAt(u16pos);
-
-			if (x >= 0x80) {
-				break jump;
-			}
-
-			u16pos++;
-			u8pos++;
-		}
-
-		return u8pos;
-	}
-
-	while (u16pos < len) {
-		const code = str.charCodeAt(u16pos);
-
-		if (code < 0x80) {
-			u16pos += 1;
-			u8pos += 1;
-		} else if (code < 0x800) {
-			u16pos += 1;
-			u8pos += 2;
-		} else if (code < 0xd800 || code > 0xdbff) {
-			u16pos += 1;
-			u8pos += 3;
-		} else {
-			u16pos += 2;
-			u8pos += 4;
-		}
-	}
-
-	return u8pos;
-};
-
-export const getGraphemeLength = (text: string): number => {
-	const iterator = segmenter.segment(text)[Symbol.iterator]();
-	let count = 0;
-
-	while (!iterator.next().done) {
-		count++;
-	}
-
-	return count;
-};
-
 // #__NO_SIDE_EFFECTS__
 export const lazyProperty = <T>(obj: object, prop: string | number | symbol, value: T): T => {
 	Object.defineProperty(obj, prop, { value });
@@ -102,7 +30,7 @@ export const allowsEval = /*#__PURE__*/ lazy((): boolean => {
 		const F = Function;
 		new F('');
 		return true;
-	} catch (_) {
+	} catch {
 		return false;
 	}
 });

package/package.json

@@ -1,7 +1,6 @@
 {
-  "type": "module",
   "name": "@atcute/lexicons",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "AT Protocol core lexicon types and schema validations",
   "license": "0BSD",
   "repository": {
@@ -14,6 +13,8 @@
     "!lib/**/*.bench.ts",
     "!lib/**/*.test.ts"
   ],
+  "type": "module",
+  "sideEffects": false,
   "exports": {
     ".": "./dist/index.js",
     "./ambient": "./dist/ambient.js",
@@ -21,19 +22,23 @@
     "./syntax": "./dist/syntax/index.js",
     "./validations": "./dist/validations/index.js"
   },
-  "sideEffects": false,
-  "devDependencies": {
-    "@vitest/coverage-v8": "^4.0.7",
-    "vitest": "^4.0.7",
-    "@atcute/multibase": "^1.1.6",
-    "@atcute/cbor": "^2.2.8"
+  "publishConfig": {
+    "access": "public"
   },
   "dependencies": {
-    "@standard-schema/spec": "^1.0.0",
-    "esm-env": "^1.2.2"
+    "@standard-schema/spec": "^1.1.0",
+    "esm-env": "^1.2.2",
+    "@atcute/util-text": "^1.1.0",
+    "@atcute/uint8array": "^1.1.0"
+  },
+  "devDependencies": {
+    "@vitest/coverage-v8": "^4.0.16",
+    "vitest": "^4.0.16",
+    "@atcute/multibase": "^1.1.7",
+    "@atcute/cbor": "^2.3.0"
   },
   "scripts": {
-    "build": "tsc --project tsconfig.build.json",
+    "build": "tsgo --project tsconfig.build.json",
     "test": "vitest --coverage",
     "prepublish": "rm -rf dist; pnpm run build"
   }