@balena/sbvr-types - npm Package Compare versions

Comparing version 7.0.7-build-renovate-major--balenalint-58e3db3861e13d463a5535b60d533280de70c4c1-1 to 7.1.0-build-read-write-types-267ce13b86b97a1b2b05f958848b0eb5fc196f08-1

CHANGELOG.md

@@ -7,6 +7,6 @@ # Change Log
 
-# v7.0.7
-## (2024-03-21)
+# v7.1.0
+## (2024-03-22)
 
-* Update dependency @balena/lint to v8 [Self-hosted Renovate Bot]
+* Export typescript read/write types for each sbvr type [Pagan Gazzard]
 
@@ -13,0 +13,0 @@ # v7.0.6

out/index.d.ts

@@ -25,2 +25,25 @@ import type { SbvrType } from './type-utils';
 export { WebResource as WebResourceType } from './types/web-resource';
+export type Types = {
+    'Big Integer': BigInteger.Types;
+    'Big Serial': BigSerial.Types;
+    Boolean: Boolean.Types;
+    'Case Insensitive Text': CaseInsensitiveText.Types;
+    Color: Color.Types;
+    ConceptType: ConceptType.Types;
+    Date: Date.Types;
+    'Date Time': DateTime.Types;
+    File: File.Types;
+    ForeignKey: ForeignKey.Types;
+    Hashed: Hashed.Types;
+    Integer: Integer.Types;
+    Interval: Interval.Types;
+    JSON: JSON.Types;
+    Real: Real.Types;
+    Serial: Serial.Types;
+    SHA: SHA.Types;
+    'Short Text': ShortText.Types;
+    Text: Text.Types;
+    Time: Time.Types;
+    WebResource: WebResource.Types;
+};
 declare const _default: {
@@ -27,0 +50,0 @@ 'Big Integer': typeof BigInteger;

out/type-utils.d.ts

@@ -19,2 +19,6 @@ export interface DatabaseTypeFn {
 }
+export interface TsTypes<Read, Write> {
+    Read: Read;
+    Write: Write;
+}
 export type FetchProcessing<Read> = (data: unknown) => Read | null | undefined;
@@ -21,0 +25,0 @@ export interface Validate<Write, DbWrite> {

out/types/big-integer.d.ts

@@ -10,3 +10,3 @@ import * as TypeUtils from '../type-utils';
 };
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
@@ -25,3 +25,3 @@ export declare const nativeFactTypes: {
 };
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/big-serial.d.ts

@@ -10,5 +10,5 @@ import * as TypeUtils from '../type-utils';
 };
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/boolean.d.ts

@@ -10,7 +10,6 @@ import * as TypeUtils from '../type-utils';
 };
-type ReadType = boolean;
-type WriteType = boolean | 0 | 1;
+export type Types = TypeUtils.TsTypes<boolean, boolean | 0 | 1>;
 type DbWriteType = boolean;
-export declare const fetchProcessing: TypeUtils.FetchProcessing<ReadType>;
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/case-insensitive-text.d.ts

@@ -10,5 +10,5 @@ import * as TypeUtils from '../type-utils';
 };
-type WriteType = string;
+export type Types = TypeUtils.TsTypes<string, string>;
 type DbWriteType = string;
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/color.d.ts

@@ -11,3 +11,3 @@ import * as TypeUtils from '../type-utils';
 };
-type ReadType = {
+type ColorObj = {
     r: number;
@@ -18,3 +18,3 @@ g: number;
 };
-type WriteType = number | ReadType;
+export type Types = TypeUtils.TsTypes<ColorObj, number | ColorObj>;
 type DbWriteType = number;
@@ -29,4 +29,4 @@ export declare const nativeProperties: {
 };
-export declare const fetchProcessing: TypeUtils.FetchProcessing<ReadType>;
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/concept-type.d.ts

@@ -10,3 +10,3 @@ import * as TypeUtils from '../type-utils';
 };
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
@@ -25,3 +25,3 @@ export declare const nativeFactTypes: {
 };
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/date-time.d.ts

@@ -10,6 +10,5 @@ import * as TypeUtils from '../type-utils';
 };
-type ReadType = string;
-type WriteType = string | number;
+export type Types = TypeUtils.TsTypes<string, string | number>;
 type DbWriteType = Date;
-export declare const fetchProcessing: TypeUtils.FetchProcessing<ReadType>;
+export declare const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']>;
 export declare const nativeFactTypes: {
@@ -24,3 +23,3 @@ 'Date Time': {
 };
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/date.d.ts

@@ -10,6 +10,5 @@ import * as TypeUtils from '../type-utils';
 };
-type ReadType = string;
-type WriteType = string | number;
+export type Types = TypeUtils.TsTypes<string, string | number>;
 type DbWriteType = Date;
-export declare const fetchProcessing: TypeUtils.FetchProcessing<ReadType>;
+export declare const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']>;
 export declare const nativeFactTypes: {
@@ -21,3 +20,3 @@ Date: {
 };
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/file.d.ts

@@ -11,5 +11,5 @@ /// <reference types="node" />
 };
-type WriteType = Buffer | string;
+export type Types = TypeUtils.TsTypes<Buffer, Buffer | string>;
 type DbWriteType = Buffer;
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/foreign-key.d.ts

@@ -10,3 +10,3 @@ import * as TypeUtils from '../type-utils';
 };
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
@@ -25,3 +25,3 @@ export declare const nativeFactTypes: {
 };
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/hashed.d.ts

@@ -11,6 +11,6 @@ import type * as Bcrypt from 'bcrypt';
 };
-type WriteType = string;
+export type Types = TypeUtils.TsTypes<string, string>;
 type DbWriteType = string;
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export declare const compare: typeof Bcrypt.compare;
 export {};

out/types/integer.d.ts

@@ -10,3 +10,3 @@ import * as TypeUtils from '../type-utils';
 };
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
@@ -25,3 +25,3 @@ export declare const nativeFactTypes: {
 };
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/interval.d.ts

@@ -10,5 +10,5 @@ import * as TypeUtils from '../type-utils';
 };
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/json.d.ts

@@ -18,11 +18,10 @@ import * as TypeUtils from '../type-utils';
 };
-type ReadType = {
+export type Types = TypeUtils.TsTypes<{
     [key: string]: JSON;
-} | JSON[];
-type WriteType = {
+} | JSON[], {
     [key: string]: JSONable;
-} | JSONable[];
+} | JSONable[]>;
 type DbWriteType = string;
-export declare const fetchProcessing: TypeUtils.FetchProcessing<ReadType>;
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/real.d.ts

@@ -10,3 +10,3 @@ import * as TypeUtils from '../type-utils';
 };
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
@@ -25,3 +25,3 @@ export declare const nativeFactTypes: {
 };
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/serial.d.ts

@@ -10,5 +10,5 @@ import * as TypeUtils from '../type-utils';
 };
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/sha.d.ts

@@ -10,7 +10,7 @@ import * as TypeUtils from '../type-utils';
 };
-type WriteType = string;
+export type Types = TypeUtils.TsTypes<string, string>;
 type DbWriteType = string;
 export declare const validateSync: (value: string) => string;
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export declare const compare: (value: string, result: string) => Promise<boolean>;
 export {};

out/types/short-text.d.ts

@@ -10,5 +10,5 @@ import * as TypeUtils from '../type-utils';
 };
-type WriteType = string;
+export type Types = TypeUtils.TsTypes<string, string>;
 type DbWriteType = string;
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/text.d.ts

@@ -10,3 +10,3 @@ import * as TypeUtils from '../type-utils';
 };
-type WriteType = string;
+export type Types = TypeUtils.TsTypes<string, string>;
 type DbWriteType = string;
@@ -26,3 +26,3 @@ export declare const nativeProperties: {
 };
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/time.d.ts

@@ -10,7 +10,6 @@ import * as TypeUtils from '../type-utils';
 };
-type ReadType = string;
-type WriteType = number | string;
+export type Types = TypeUtils.TsTypes<string, number | string>;
 type DbWriteType = string;
-export declare const fetchProcessing: TypeUtils.FetchProcessing<ReadType>;
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

out/types/web-resource.d.ts

@@ -20,4 +20,3 @@ import * as TypeUtils from '../type-utils';
 };
-type ReadType = WebResource;
-type WriteType = WebResource;
+export type Types = TypeUtils.TsTypes<WebResource, WebResource>;
 type DbWriteType = string;
@@ -34,4 +33,4 @@ export declare const nativeProperties: {
 };
-export declare const fetchProcessing: TypeUtils.FetchProcessing<ReadType>;
-export declare const validate: TypeUtils.Validate<WriteType, DbWriteType>;
+export declare const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']>;
+export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

package.json

 {
   "name": "@balena/sbvr-types",
-  "version": "7.0.7-build-renovate-major--balenalint-58e3db3861e13d463a5535b60d533280de70c4c1-1",
+  "version": "7.1.0-build-read-write-types-267ce13b86b97a1b2b05f958848b0eb5fc196f08-1",
   "description": "SBVR type definitions.",
@@ -24,3 +24,3 @@ "main": "out",
     "@balena/abstract-sql-compiler": "^9.0.5",
-    "@balena/lint": "^8.0.0",
+    "@balena/lint": "^7.3.0",
     "@types/bcrypt": "^5.0.2",
@@ -55,4 +55,4 @@ "@types/chai": "^4.3.12",
   "versionist": {
-    "publishedAt": "2024-03-21T15:47:26.161Z"
+    "publishedAt": "2024-03-22T18:02:36.658Z"
   }
 }

src/index.ts

@@ -29,2 +29,27 @@ import type { SbvrType } from './type-utils';
 
+export type Types = {
+	'Big Integer': BigInteger.Types;
+	'Big Serial': BigSerial.Types;
+	// eslint-disable-next-line id-denylist
+	Boolean: Boolean.Types;
+	'Case Insensitive Text': CaseInsensitiveText.Types;
+	Color: Color.Types;
+	ConceptType: ConceptType.Types;
+	Date: Date.Types;
+	'Date Time': DateTime.Types;
+	File: File.Types;
+	ForeignKey: ForeignKey.Types;
+	Hashed: Hashed.Types;
+	Integer: Integer.Types;
+	Interval: Interval.Types;
+	JSON: JSON.Types;
+	Real: Real.Types;
+	Serial: Serial.Types;
+	SHA: SHA.Types;
+	'Short Text': ShortText.Types;
+	Text: Text.Types;
+	Time: Time.Types;
+	WebResource: WebResource.Types;
+};
+
 export default {
@@ -31,0 +56,0 @@ 'Big Integer': BigInteger,

src/type-utils.ts

@@ -19,2 +19,6 @@ export interface DatabaseTypeFn {
 }
+export interface TsTypes<Read, Write> {
+	Read: Read;
+	Write: Write;
+}
 
@@ -21,0 +25,0 @@ export type FetchProcessing<Read> = (data: unknown) => Read | null | undefined;

src/types/big-integer.ts

@@ -12,3 +12,3 @@ import * as TypeUtils from '../type-utils';
 
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
@@ -21,3 +21,3 @@
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.integer;

src/types/big-serial.ts

@@ -26,6 +26,6 @@ import * as TypeUtils from '../type-utils';
 
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.integer;

src/types/boolean.ts

@@ -19,11 +19,11 @@ import * as TypeUtils from '../type-utils';
 
-type ReadType = boolean;
-type WriteType = boolean | 0 | 1;
+export type Types = TypeUtils.TsTypes<boolean, boolean | 0 | 1>;
 type DbWriteType = boolean;
 
 // `BOOLEAN` on sqlite/websql is just an alias for `INTEGER` hence the `=== 1` check
-export const fetchProcessing: TypeUtils.FetchProcessing<ReadType> = (data) =>
-	data === true || data === 1;
+export const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']> = (
+	data,
+) => data === true || data === 1;
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.checkRequired((originalValue) => {
@@ -30,0 +30,0 @@ // We use Number rather than parseInt as it deals with booleans and will return NaN for things like "a1"

src/types/case-insensitive-text.ts

@@ -12,6 +12,6 @@ import * as TypeUtils from '../type-utils';
 
-type WriteType = string;
+export type Types = TypeUtils.TsTypes<string, string>;
 type DbWriteType = string;
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.text();

src/types/color.ts

@@ -19,3 +19,3 @@ import * as TypeUtils from '../type-utils';
 
-type ReadType = {
+type ColorObj = {
 	r: number;
@@ -26,3 +26,3 @@ g: number;
 };
-type WriteType = number | ReadType;
+export type Types = TypeUtils.TsTypes<ColorObj, number | ColorObj>;
 type DbWriteType = number;
@@ -51,3 +51,5 @@
 
-export const fetchProcessing: TypeUtils.FetchProcessing<ReadType> = (data) => {
+export const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']> = (
+	data,
+) => {
 	if (typeof data !== 'number') {
@@ -66,3 +68,3 @@ throw new Error('Fetched color is not an integer: ' + typeof data);
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.checkRequired((value) => {
@@ -69,0 +71,0 @@ let processedValue: number;

src/types/concept-type.ts

@@ -12,3 +12,3 @@ import * as TypeUtils from '../type-utils';
 
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
@@ -21,3 +21,3 @@
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.integer;

src/types/date-time.ts

@@ -12,7 +12,8 @@ import * as TypeUtils from '../type-utils';
 
-type ReadType = string;
-type WriteType = string | number;
+export type Types = TypeUtils.TsTypes<string, string | number>;
 type DbWriteType = Date;
 
-export const fetchProcessing: TypeUtils.FetchProcessing<ReadType> = (data) => {
+export const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']> = (
+	data,
+) => {
 	if (data == null) {
@@ -43,3 +44,3 @@ return data;
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.date;

src/types/date.ts

@@ -12,7 +12,8 @@ import * as TypeUtils from '../type-utils';
 
-type ReadType = string;
-type WriteType = string | number;
+export type Types = TypeUtils.TsTypes<string, string | number>;
 type DbWriteType = Date;
 
-export const fetchProcessing: TypeUtils.FetchProcessing<ReadType> = (data) => {
+export const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']> = (
+	data,
+) => {
 	if (data == null) {
@@ -39,3 +40,3 @@ return data;
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.date;

src/types/file.ts

@@ -11,6 +11,6 @@ import * as TypeUtils from '../type-utils';
 
-type WriteType = Buffer | string;
+export type Types = TypeUtils.TsTypes<Buffer, Buffer | string>;
 type DbWriteType = Buffer;
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.checkRequired((value) => {
@@ -17,0 +17,0 @@ if (Buffer.isBuffer(value)) {

src/types/foreign-key.ts

@@ -12,3 +12,3 @@ import * as TypeUtils from '../type-utils';
 
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
@@ -21,3 +21,3 @@
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.integer;

src/types/hashed.ts

@@ -21,6 +21,6 @@ import type * as Bcrypt from 'bcrypt';
 
-type WriteType = string;
+export type Types = TypeUtils.TsTypes<string, string>;
 type DbWriteType = string;
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.checkRequired(async (value) => {
@@ -27,0 +27,0 @@ if (typeof value !== 'string') {

src/types/integer.ts

@@ -12,3 +12,3 @@ import * as TypeUtils from '../type-utils';
 
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
@@ -21,3 +21,3 @@
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.integer;

src/types/interval.ts

@@ -12,6 +12,6 @@ import * as TypeUtils from '../type-utils';
 
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.integer;

src/types/json.ts

@@ -23,7 +23,11 @@ import * as TypeUtils from '../type-utils';
 
-type ReadType = { [key: string]: JSON } | JSON[];
-type WriteType = { [key: string]: JSONable } | JSONable[];
+export type Types = TypeUtils.TsTypes<
+	{ [key: string]: JSON } | JSON[],
+	{ [key: string]: JSONable } | JSONable[]
+>;
 type DbWriteType = string;
 
-export const fetchProcessing: TypeUtils.FetchProcessing<ReadType> = (data) => {
+export const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']> = (
+	data,
+) => {
 	if (typeof data === 'string') {
@@ -35,3 +39,3 @@ return JSON.parse(data);
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.checkRequired((value) => {
@@ -38,0 +42,0 @@ // Disallow primitives

src/types/real.ts

@@ -12,3 +12,3 @@ import * as TypeUtils from '../type-utils';
 
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
@@ -21,3 +21,3 @@
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.checkRequired((value) => {
@@ -24,0 +24,0 @@ const processedValue = parseFloat(value);

src/types/serial.ts

@@ -26,6 +26,6 @@ import * as TypeUtils from '../type-utils';
 
-type WriteType = number;
+export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.integer;

src/types/sha.ts

@@ -33,3 +33,3 @@ // We are using the P-H-C storing format:
 
-type WriteType = string;
+export type Types = TypeUtils.TsTypes<string, string>;
 type DbWriteType = string;
@@ -39,3 +39,3 @@
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.checkRequired((value) => {
@@ -42,0 +42,0 @@ if (typeof value !== 'string') {

src/types/short-text.ts

@@ -12,6 +12,6 @@ import * as TypeUtils from '../type-utils';
 
-type WriteType = string;
+export type Types = TypeUtils.TsTypes<string, string>;
 type DbWriteType = string;
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.text(255);

src/types/text.ts

@@ -12,3 +12,3 @@ import * as TypeUtils from '../type-utils';
 
-type WriteType = string;
+export type Types = TypeUtils.TsTypes<string, string>;
 type DbWriteType = string;
@@ -31,3 +31,3 @@
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.text();

src/types/time.ts

@@ -12,7 +12,8 @@ import * as TypeUtils from '../type-utils';
 
-type ReadType = string;
-type WriteType = number | string;
+export type Types = TypeUtils.TsTypes<string, number | string>;
 type DbWriteType = string;
 
-export const fetchProcessing: TypeUtils.FetchProcessing<ReadType> = (data) => {
+export const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']> = (
+	data,
+) => {
 	if (data != null) {
@@ -25,15 +26,13 @@ // We append the date of the epoch so that we can parse this as a valid date.
 
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> = (async (
-	value,
-	required,
-) => {
-	const date = await TypeUtils.validate.date(value, required);
-	if (date == null) {
-		return date;
-	}
-	return date.toLocaleTimeString();
-}) as {
-	(value: WriteType, required: true): Promise<DbWriteType>;
-	(value: WriteType, required: false): Promise<DbWriteType | null>;
-	(value: WriteType, required: boolean): Promise<DbWriteType | null>;
-};
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
+	(async (value, required) => {
+		const date = await TypeUtils.validate.date(value, required);
+		if (date == null) {
+			return date;
+		}
+		return date.toLocaleTimeString();
+	}) as {
+		(value: Types['Write'], required: true): Promise<DbWriteType>;
+		(value: Types['Write'], required: false): Promise<DbWriteType | null>;
+		(value: Types['Write'], required: boolean): Promise<DbWriteType | null>;
+	};

src/types/web-resource.ts

@@ -35,4 +35,3 @@ import * as TypeUtils from '../type-utils';
 
-type ReadType = WebResource;
-type WriteType = WebResource;
+export type Types = TypeUtils.TsTypes<WebResource, WebResource>;
 type DbWriteType = string;
@@ -94,3 +93,5 @@
  */
-export const fetchProcessing: TypeUtils.FetchProcessing<ReadType> = (data) => {
+export const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']> = (
+	data,
+) => {
 	let refData: WebResource;
@@ -128,3 +129,3 @@ if (data === null) {
  */
-export const validate: TypeUtils.Validate<WriteType, DbWriteType> =
+export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =
 	TypeUtils.validate.checkRequired(async (value: WebResource) => {
@@ -131,0 +132,0 @@ if (typeof value !== 'object') {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

145948

increased by1.86%

Lines of code

2283

increased by2.56%

No dependency changes