@atproto/syntax 0.3.1 → 0.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/dist/aturi_validation.js +1 -1
- package/dist/aturi_validation.js.map +1 -1
- package/dist/tid.d.ts.map +1 -1
- package/dist/tid.js +6 -13
- package/dist/tid.js.map +1 -1
- package/jest.config.js +1 -0
- package/package.json +1 -1
- package/src/aturi_validation.ts +1 -1
- package/src/tid.ts +7 -13
- package/tests/aturi.test.ts +2 -2
- package/tests/datetime.test.ts +4 -4
- package/tests/did.test.ts +3 -3
- package/tests/handle.test.ts +4 -4
- package/tests/nsid.test.ts +4 -4
- package/tests/recordkey.test.ts +3 -3
- package/tests/tid.test.ts +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# @atproto/syntax
|
|
2
2
|
|
|
3
|
+
## 0.3.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Improve performance of isValidTid
|
|
8
|
+
|
|
9
|
+
## 0.3.2
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
|
|
14
|
+
|
|
3
15
|
## 0.3.1
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
package/dist/aturi_validation.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ensureValidAtUriRegex = exports.ensureValidAtUri = void 0;
|
|
4
|
-
const handle_1 = require("./handle");
|
|
5
4
|
const did_1 = require("./did");
|
|
5
|
+
const handle_1 = require("./handle");
|
|
6
6
|
const nsid_1 = require("./nsid");
|
|
7
7
|
// Human-readable constraints on ATURI:
|
|
8
8
|
// - following regular URLs, a 8KByte hard total length limit
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aturi_validation.js","sourceRoot":"","sources":["../src/aturi_validation.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"aturi_validation.js","sourceRoot":"","sources":["../src/aturi_validation.ts"],"names":[],"mappings":"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"}
|
package/dist/tid.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tid.d.ts","sourceRoot":"","sources":["../src/tid.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tid.d.ts","sourceRoot":"","sources":["../src/tid.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc,QAAS,MAAM,KAAG,IAQ5C,CAAA;AAED,eAAO,MAAM,UAAU,QAAS,MAAM,KAAG,OAExC,CAAA;AAED,qBAAa,eAAgB,SAAQ,KAAK;CAAG"}
|
package/dist/tid.js
CHANGED
|
@@ -1,27 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.InvalidTidError = exports.isValidTid = exports.ensureValidTid = void 0;
|
|
4
|
+
const TID_LENGTH = 13;
|
|
5
|
+
const TID_REGEX = /^[234567abcdefghij][234567abcdefghijklmnopqrstuvwxyz]{12}$/;
|
|
4
6
|
const ensureValidTid = (tid) => {
|
|
5
|
-
if (tid.length !==
|
|
6
|
-
throw new InvalidTidError(
|
|
7
|
+
if (tid.length !== TID_LENGTH) {
|
|
8
|
+
throw new InvalidTidError(`TID must be ${TID_LENGTH} characters`);
|
|
7
9
|
}
|
|
8
10
|
// simple regex to enforce most constraints via just regex and length.
|
|
9
|
-
if (
|
|
11
|
+
if (!TID_REGEX.test(tid)) {
|
|
10
12
|
throw new InvalidTidError('TID syntax not valid (regex)');
|
|
11
13
|
}
|
|
12
14
|
};
|
|
13
15
|
exports.ensureValidTid = ensureValidTid;
|
|
14
16
|
const isValidTid = (tid) => {
|
|
15
|
-
|
|
16
|
-
(0, exports.ensureValidTid)(tid);
|
|
17
|
-
}
|
|
18
|
-
catch (err) {
|
|
19
|
-
if (err instanceof InvalidTidError) {
|
|
20
|
-
return false;
|
|
21
|
-
}
|
|
22
|
-
throw err;
|
|
23
|
-
}
|
|
24
|
-
return true;
|
|
17
|
+
return tid.length === TID_LENGTH && TID_REGEX.test(tid);
|
|
25
18
|
};
|
|
26
19
|
exports.isValidTid = isValidTid;
|
|
27
20
|
class InvalidTidError extends Error {
|
package/dist/tid.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tid.js","sourceRoot":"","sources":["../src/tid.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"tid.js","sourceRoot":"","sources":["../src/tid.ts"],"names":[],"mappings":";;;AAAA,MAAM,UAAU,GAAG,EAAE,CAAA;AACrB,MAAM,SAAS,GAAG,4DAA4D,CAAA;AAEvE,MAAM,cAAc,GAAG,CAAC,GAAW,EAAQ,EAAE;IAClD,IAAI,GAAG,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;QAC9B,MAAM,IAAI,eAAe,CAAC,eAAe,UAAU,aAAa,CAAC,CAAA;IACnE,CAAC;IACD,sEAAsE;IACtE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,eAAe,CAAC,8BAA8B,CAAC,CAAA;IAC3D,CAAC;AACH,CAAC,CAAA;AARY,QAAA,cAAc,kBAQ1B;AAEM,MAAM,UAAU,GAAG,CAAC,GAAW,EAAW,EAAE;IACjD,OAAO,GAAG,CAAC,MAAM,KAAK,UAAU,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACzD,CAAC,CAAA;AAFY,QAAA,UAAU,cAEtB;AAED,MAAa,eAAgB,SAAQ,KAAK;CAAG;AAA7C,0CAA6C"}
|
package/jest.config.js
CHANGED
package/package.json
CHANGED
package/src/aturi_validation.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ensureValidHandle, ensureValidHandleRegex } from './handle'
|
|
2
1
|
import { ensureValidDid, ensureValidDidRegex } from './did'
|
|
2
|
+
import { ensureValidHandle, ensureValidHandleRegex } from './handle'
|
|
3
3
|
import { ensureValidNsid, ensureValidNsidRegex } from './nsid'
|
|
4
4
|
|
|
5
5
|
// Human-readable constraints on ATURI:
|
package/src/tid.ts
CHANGED
|
@@ -1,24 +1,18 @@
|
|
|
1
|
+
const TID_LENGTH = 13
|
|
2
|
+
const TID_REGEX = /^[234567abcdefghij][234567abcdefghijklmnopqrstuvwxyz]{12}$/
|
|
3
|
+
|
|
1
4
|
export const ensureValidTid = (tid: string): void => {
|
|
2
|
-
if (tid.length !==
|
|
3
|
-
throw new InvalidTidError(
|
|
5
|
+
if (tid.length !== TID_LENGTH) {
|
|
6
|
+
throw new InvalidTidError(`TID must be ${TID_LENGTH} characters`)
|
|
4
7
|
}
|
|
5
8
|
// simple regex to enforce most constraints via just regex and length.
|
|
6
|
-
if (
|
|
9
|
+
if (!TID_REGEX.test(tid)) {
|
|
7
10
|
throw new InvalidTidError('TID syntax not valid (regex)')
|
|
8
11
|
}
|
|
9
12
|
}
|
|
10
13
|
|
|
11
14
|
export const isValidTid = (tid: string): boolean => {
|
|
12
|
-
|
|
13
|
-
ensureValidTid(tid)
|
|
14
|
-
} catch (err) {
|
|
15
|
-
if (err instanceof InvalidTidError) {
|
|
16
|
-
return false
|
|
17
|
-
}
|
|
18
|
-
throw err
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
return true
|
|
15
|
+
return tid.length === TID_LENGTH && TID_REGEX.test(tid)
|
|
22
16
|
}
|
|
23
17
|
|
|
24
18
|
export class InvalidTidError extends Error {}
|
package/tests/aturi.test.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import * as fs from 'node:fs'
|
|
2
|
+
import * as readline from 'node:readline'
|
|
1
3
|
import { AtUri, ensureValidAtUri, ensureValidAtUriRegex } from '../src/index'
|
|
2
|
-
import * as readline from 'readline'
|
|
3
|
-
import * as fs from 'fs'
|
|
4
4
|
|
|
5
5
|
describe('At Uris', () => {
|
|
6
6
|
it('parses valid at uris', () => {
|
package/tests/datetime.test.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
+
import * as fs from 'node:fs'
|
|
2
|
+
import * as readline from 'node:readline'
|
|
1
3
|
import {
|
|
2
|
-
|
|
4
|
+
InvalidDatetimeError,
|
|
3
5
|
ensureValidDatetime,
|
|
6
|
+
isValidDatetime,
|
|
4
7
|
normalizeDatetime,
|
|
5
8
|
normalizeDatetimeAlways,
|
|
6
|
-
InvalidDatetimeError,
|
|
7
9
|
} from '../src'
|
|
8
|
-
import * as readline from 'readline'
|
|
9
|
-
import * as fs from 'fs'
|
|
10
10
|
|
|
11
11
|
describe('datetime validation', () => {
|
|
12
12
|
const expectValid = (h: string) => {
|
package/tests/did.test.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import * as readline from 'readline'
|
|
3
|
-
import
|
|
1
|
+
import * as fs from 'node:fs'
|
|
2
|
+
import * as readline from 'node:readline'
|
|
3
|
+
import { InvalidDidError, ensureValidDid, ensureValidDidRegex } from '../src'
|
|
4
4
|
|
|
5
5
|
describe('DID permissive validation', () => {
|
|
6
6
|
const expectValid = (h: string) => {
|
package/tests/handle.test.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
+
import * as fs from 'node:fs'
|
|
2
|
+
import * as readline from 'node:readline'
|
|
1
3
|
import {
|
|
4
|
+
InvalidHandleError,
|
|
2
5
|
ensureValidHandle,
|
|
3
|
-
normalizeAndEnsureValidHandle,
|
|
4
6
|
ensureValidHandleRegex,
|
|
5
|
-
|
|
7
|
+
normalizeAndEnsureValidHandle,
|
|
6
8
|
} from '../src'
|
|
7
|
-
import * as readline from 'readline'
|
|
8
|
-
import * as fs from 'fs'
|
|
9
9
|
|
|
10
10
|
describe('handle validation', () => {
|
|
11
11
|
const expectValid = (h: string) => {
|
package/tests/nsid.test.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
+
import * as fs from 'node:fs'
|
|
2
|
+
import * as readline from 'node:readline'
|
|
1
3
|
import {
|
|
2
|
-
ensureValidNsid,
|
|
3
|
-
ensureValidNsidRegex,
|
|
4
4
|
InvalidNsidError,
|
|
5
5
|
NSID,
|
|
6
|
+
ensureValidNsid,
|
|
7
|
+
ensureValidNsidRegex,
|
|
6
8
|
} from '../src'
|
|
7
|
-
import * as readline from 'readline'
|
|
8
|
-
import * as fs from 'fs'
|
|
9
9
|
|
|
10
10
|
describe('NSID parsing & creation', () => {
|
|
11
11
|
it('parses valid NSIDs', () => {
|
package/tests/recordkey.test.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import * as readline from 'readline'
|
|
3
|
-
import
|
|
1
|
+
import * as fs from 'node:fs'
|
|
2
|
+
import * as readline from 'node:readline'
|
|
3
|
+
import { InvalidRecordKeyError, ensureValidRecordKey } from '../src'
|
|
4
4
|
|
|
5
5
|
describe('recordkey validation', () => {
|
|
6
6
|
const expectValid = (r: string) => {
|
package/tests/tid.test.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import * as readline from 'readline'
|
|
3
|
-
import
|
|
1
|
+
import * as fs from 'node:fs'
|
|
2
|
+
import * as readline from 'node:readline'
|
|
3
|
+
import { InvalidTidError, ensureValidTid } from '../src'
|
|
4
4
|
|
|
5
5
|
describe('tid validation', () => {
|
|
6
6
|
const expectValid = (t: string) => {
|