@contember/engine-system-api 1.1.0-alpha.4 → 1.1.0-alpha.7

package/package.json

@@ -1,39 +1,37 @@
 {
   "name": "@contember/engine-system-api",
-  "version": "1.1.0-alpha.4",
+  "version": "1.1.0-alpha.7",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
   "scripts": {
     "generate": "gql-gen --config graphql.codegen.yml",
-    "test": "uvu dist/tests/cases/ \\\\.js$"
+    "test": "vitest"
   },
   "dependencies": {
-    "@contember/authorization": "^1.1.0-alpha.4",
-    "@contember/database": "^1.1.0-alpha.4",
-    "@contember/database-migrations": "^1.1.0-alpha.4",
-    "@contember/dic": "^1.1.0-alpha.4",
-    "@contember/engine-common": "^1.1.0-alpha.4",
-    "@contember/graphql-utils": "^1.1.0-alpha.4",
-    "@contember/queryable": "^1.1.0-alpha.4",
-    "@contember/schema": "^1.1.0-alpha.4",
-    "@contember/schema-migrations": "^1.1.0-alpha.4",
-    "@contember/schema-utils": "^1.1.0-alpha.4",
+    "@contember/authorization": "^1.1.0-alpha.7",
+    "@contember/database": "^1.1.0-alpha.7",
+    "@contember/database-migrations": "^1.1.0-alpha.7",
+    "@contember/dic": "^1.1.0-alpha.7",
+    "@contember/engine-common": "^1.1.0-alpha.7",
+    "@contember/graphql-utils": "^1.1.0-alpha.7",
+    "@contember/queryable": "^1.1.0-alpha.7",
+    "@contember/schema": "^1.1.0-alpha.7",
+    "@contember/schema-migrations": "^1.1.0-alpha.7",
+    "@contember/schema-utils": "^1.1.0-alpha.7",
     "@graphql-tools/utils": "^7.10.0",
-    "apollo-server-errors": "^2.4.0",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/engine-api-tester": "^1.1.0-alpha.4",
-    "@contember/schema-definition": "^1.1.0-alpha.4",
+    "@contember/engine-api-tester": "^1.1.0-alpha.7",
+    "@contember/schema-definition": "^1.1.0-alpha.7",
     "@graphql-codegen/cli": "^1.15.2",
     "@graphql-codegen/typescript": "^1.15.2",
     "@graphql-codegen/typescript-operations": "^1.15.2",
     "@graphql-codegen/typescript-resolvers": "^1.15.2",
     "@types/node": "^17.0.5",
     "graphql": "^15.4.0",
-    "pg": "^8.5.0",
-    "uvu": "^0.5.3"
+    "pg": "^8.5.0"
   },
   "peerDependencies": {
     "graphql": ">= 14.6.0",

package/src/model/ProjectTruncateExecutor.ts

@@ -8,11 +8,14 @@ import { StagesQuery } from './queries'
 
 export class ProjectTruncateExecutor {
 	public async truncateProject(db: DatabaseContext, project: ProjectConfig, schema: Schema) {
+		const tableNames = Object.values(schema.model.entities).filter(it => !it.view).map(it => it.tableName)
+		const junctionTableNames = getJunctionTables(schema.model).map(it => it.tableName)
+		const allTableNames = [...tableNames, ...junctionTableNames]
+		if (allTableNames.length === 0) {
+			return
+		}
 		await db.transaction(async trx => {
 			await trx.client.query('SET CONSTRAINTS ALL DEFERRED')
-			const tableNames = Object.values(schema.model.entities).filter(it => !it.view).map(it => it.tableName)
-			const junctionTableNames = getJunctionTables(schema.model).map(it => it.tableName)
-			const allTableNames = [...tableNames, ...junctionTableNames]
 			const stages = await db.queryHandler.fetch(new StagesQuery())
 			for (const stage of stages) {
 				const wrappedNames = allTableNames.map(it => `${wrapIdentifier(stage.schema)}.${wrapIdentifier(it)}`)

package/src/resolvers/ResolverFactory.ts

@@ -4,6 +4,7 @@ import { assertNever } from '../utils'
 import { MigrateMutationResolver, MigrationAlterMutationResolver, TruncateMutationResolver } from './mutation'
 import { DateTimeType, JSONType } from '@contember/graphql-utils'
 import { EventOldValuesResolver } from './types'
+import { GraphQLError, GraphQLScalarType, Kind } from 'graphql'
 
 export class ResolverFactory {
 	public constructor(
@@ -20,6 +21,7 @@ export class ResolverFactory {
 		const resolvers: Resolvers & Required<Pick<Resolvers, 'Mutation'>> = {
 			DateTime: DateTimeType,
 			Json: JSONType,
+			PrimaryKey: PrimaryKeyType,
 			Event: {
 				__resolveType: (obj: Event) => {
 					switch (obj.type) {
@@ -61,3 +63,25 @@ export class ResolverFactory {
 		return resolvers
 	}
 }
+
+const parseValue = (value: any)  => {
+	if ((typeof value === 'string' && value !== '') || typeof value === 'number' && isFinite(value) && Math.floor(value) === value) {
+		return value
+	}
+	throw new GraphQLError('PrimaryKey cannot represent value: ' + JSON.stringify(value))
+}
+export const PrimaryKeyType = new GraphQLScalarType({
+	name: 'PrimaryKey',
+	description: 'PrimaryKey custom scalar type. Can be Int or String',
+	serialize: parseValue,
+	parseValue: parseValue,
+	parseLiteral(ast) {
+		if (ast.kind === Kind.STRING) {
+			return ast.value
+		}
+		if (ast.kind === Kind.INT) {
+			return Number.parseInt(ast.value, 10)
+		}
+		return null
+	},
+})

package/src/resolvers/SystemResolverContext.ts

@@ -1,6 +1,6 @@
 import { Authorizator } from '@contember/authorization'
 import { Schema } from '@contember/schema'
-import { ForbiddenError } from 'apollo-server-errors'
+import { ForbiddenError } from '@contember/graphql-utils'
 import { DatabaseContext, Identity, SchemaVersionBuilder } from '../model'
 import { ProjectConfig } from '../types'
 import { StagePermissionsFactory } from '../model/authorization/StagePermissionsFactory'

package/src/resolvers/query/EventsQueryResolver.ts

@@ -3,7 +3,7 @@ import { SystemResolverContext } from '../SystemResolverContext'
 import { QueryResolver } from '../Resolver'
 import { EventsOrder, QueryEventsArgs, ResolversTypes } from '../../schema'
 import { AuthorizationActions, EventResponseBuilder, EventsQuery, StageBySlugQuery } from '../../model'
-import { UserInputError } from 'apollo-server-errors'
+import { UserInputError } from '@contember/graphql-utils'
 
 export class EventsQueryResolver implements QueryResolver<'events'> {
 	constructor(

package/src/schema/system.graphql.ts

@@ -4,6 +4,7 @@ import { DocumentNode } from 'graphql'
 const schema: DocumentNode = gql`
 	scalar DateTime
 	scalar Json
+	scalar PrimaryKey
 
 	schema {
 		query: Query
@@ -55,7 +56,7 @@ const schema: DocumentNode = gql`
 
 	input EventFilterRow {
 		tableName: String!
-		primaryKey: [String!]!
+		primaryKey: [PrimaryKey!]!
 	}
 
 	interface Event {
@@ -68,7 +69,7 @@ const schema: DocumentNode = gql`
 		appliedAt: DateTime!
 		type: EventType!
 		tableName: String!
-		primaryKey: [String!]!
+		primaryKey: [PrimaryKey!]!
 	}
 
 	enum EventType {
@@ -87,7 +88,7 @@ const schema: DocumentNode = gql`
 		appliedAt: DateTime!
 		type: EventType!
 		tableName: String!
-		primaryKey: [String!]!
+		primaryKey: [PrimaryKey!]!
 		oldValues: Json!
 		diffValues: Json!
 	}
@@ -102,7 +103,7 @@ const schema: DocumentNode = gql`
 		appliedAt: DateTime!
 		type: EventType!
 		tableName: String!
-		primaryKey: [String!]!
+		primaryKey: [PrimaryKey!]!
 		oldValues: Json!
 	}
 
@@ -116,7 +117,7 @@ const schema: DocumentNode = gql`
 		appliedAt: DateTime!
 		type: EventType!
 		tableName: String!
-		primaryKey: [String!]!
+		primaryKey: [PrimaryKey!]!
 		newValues: Json!
 	}
 

package/src/schema/types.ts

@@ -13,6 +13,7 @@ export type Scalars = {
 	Float: number
 	DateTime: Date
 	Json: unknown
+	PrimaryKey: any
 }
 
 export type CreateEvent = Event & {
@@ -26,7 +27,7 @@ export type CreateEvent = Event & {
 	readonly appliedAt: Scalars['DateTime']
 	readonly type: EventType
 	readonly tableName: Scalars['String']
-	readonly primaryKey: ReadonlyArray<Scalars['String']>
+	readonly primaryKey: ReadonlyArray<Scalars['PrimaryKey']>
 	readonly newValues: Scalars['Json']
 }
 
@@ -42,7 +43,7 @@ export type DeleteEvent = Event & {
 	readonly appliedAt: Scalars['DateTime']
 	readonly type: EventType
 	readonly tableName: Scalars['String']
-	readonly primaryKey: ReadonlyArray<Scalars['String']>
+	readonly primaryKey: ReadonlyArray<Scalars['PrimaryKey']>
 	readonly oldValues: Scalars['Json']
 }
 
@@ -56,12 +57,12 @@ export type Event = {
 	readonly appliedAt: Scalars['DateTime']
 	readonly type: EventType
 	readonly tableName: Scalars['String']
-	readonly primaryKey: ReadonlyArray<Scalars['String']>
+	readonly primaryKey: ReadonlyArray<Scalars['PrimaryKey']>
 }
 
 export type EventFilterRow = {
 	readonly tableName: Scalars['String']
-	readonly primaryKey: ReadonlyArray<Scalars['String']>
+	readonly primaryKey: ReadonlyArray<Scalars['PrimaryKey']>
 }
 
 export enum EventType {
@@ -218,6 +219,7 @@ export type MutationMigrationModifyArgs = {
 	modification: MigrationModification
 }
 
+
 export type Query = {
 	readonly __typename?: 'Query'
 	readonly stages: ReadonlyArray<Stage>
@@ -258,7 +260,7 @@ export type UpdateEvent = Event & {
 	readonly appliedAt: Scalars['DateTime']
 	readonly type: EventType
 	readonly tableName: Scalars['String']
-	readonly primaryKey: ReadonlyArray<Scalars['String']>
+	readonly primaryKey: ReadonlyArray<Scalars['PrimaryKey']>
 	readonly oldValues: Scalars['Json']
 	readonly diffValues: Scalars['Json']
 }
@@ -268,6 +270,10 @@ export type UpdateEvent = Event & {
 export type ResolverTypeWrapper<T> = Promise<T> | T
 
 
+export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
+	resolve: ResolverFn<TResult, TParent, TContext, TArgs>
+}
+
 export type LegacyStitchingResolver<TResult, TParent, TContext, TArgs> = {
 	fragment: string
 	resolve: ResolverFn<TResult, TParent, TContext, TArgs>
@@ -280,6 +286,7 @@ export type NewStitchingResolver<TResult, TParent, TContext, TArgs> = {
 export type StitchingResolver<TResult, TParent, TContext, TArgs> = LegacyStitchingResolver<TResult, TParent, TContext, TArgs> | NewStitchingResolver<TResult, TParent, TContext, TArgs>
 export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> =
   | ResolverFn<TResult, TParent, TContext, TArgs>
+  | ResolverWithResolve<TResult, TParent, TContext, TArgs>
   | StitchingResolver<TResult, TParent, TContext, TArgs>
 
 export type ResolverFn<TResult, TParent, TContext, TArgs> = (
@@ -369,6 +376,7 @@ export type ResolversTypes = {
 	MigrationModifyErrorCode: MigrationModifyErrorCode
 	MigrationModifyResponse: ResolverTypeWrapper<MigrationModifyResponse>
 	Mutation: ResolverTypeWrapper<{}>
+	PrimaryKey: ResolverTypeWrapper<Scalars['PrimaryKey']>
 	Query: ResolverTypeWrapper<{}>
 	Stage: ResolverTypeWrapper<Stage>
 	TruncateResponse: ResolverTypeWrapper<TruncateResponse>
@@ -400,6 +408,7 @@ export type ResolversParentTypes = {
 	MigrationModifyError: MigrationModifyError
 	MigrationModifyResponse: MigrationModifyResponse
 	Mutation: {}
+	PrimaryKey: Scalars['PrimaryKey']
 	Query: {}
 	Stage: Stage
 	TruncateResponse: TruncateResponse
@@ -416,7 +425,7 @@ export type CreateEventResolvers<ContextType = any, ParentType extends Resolvers
 	appliedAt?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>
 	type?: Resolver<ResolversTypes['EventType'], ParentType, ContextType>
 	tableName?: Resolver<ResolversTypes['String'], ParentType, ContextType>
-	primaryKey?: Resolver<ReadonlyArray<ResolversTypes['String']>, ParentType, ContextType>
+	primaryKey?: Resolver<ReadonlyArray<ResolversTypes['PrimaryKey']>, ParentType, ContextType>
 	newValues?: Resolver<ResolversTypes['Json'], ParentType, ContextType>
 	__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
 }
@@ -435,7 +444,7 @@ export type DeleteEventResolvers<ContextType = any, ParentType extends Resolvers
 	appliedAt?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>
 	type?: Resolver<ResolversTypes['EventType'], ParentType, ContextType>
 	tableName?: Resolver<ResolversTypes['String'], ParentType, ContextType>
-	primaryKey?: Resolver<ReadonlyArray<ResolversTypes['String']>, ParentType, ContextType>
+	primaryKey?: Resolver<ReadonlyArray<ResolversTypes['PrimaryKey']>, ParentType, ContextType>
 	oldValues?: Resolver<ResolversTypes['Json'], ParentType, ContextType>
 	__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
 }
@@ -451,7 +460,7 @@ export type EventResolvers<ContextType = any, ParentType extends ResolversParent
 	appliedAt?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>
 	type?: Resolver<ResolversTypes['EventType'], ParentType, ContextType>
 	tableName?: Resolver<ResolversTypes['String'], ParentType, ContextType>
-	primaryKey?: Resolver<ReadonlyArray<ResolversTypes['String']>, ParentType, ContextType>
+	primaryKey?: Resolver<ReadonlyArray<ResolversTypes['PrimaryKey']>, ParentType, ContextType>
 }
 
 export type ExecutedMigrationResolvers<ContextType = any, ParentType extends ResolversParentTypes['ExecutedMigration'] = ResolversParentTypes['ExecutedMigration']> = {
@@ -520,6 +529,10 @@ export type MutationResolvers<ContextType = any, ParentType extends ResolversPar
 	truncate?: Resolver<ResolversTypes['TruncateResponse'], ParentType, ContextType>
 }
 
+export interface PrimaryKeyScalarConfig extends GraphQLScalarTypeConfig<ResolversTypes['PrimaryKey'], any> {
+	name: 'PrimaryKey'
+}
+
 export type QueryResolvers<ContextType = any, ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query']> = {
 	stages?: Resolver<ReadonlyArray<ResolversTypes['Stage']>, ParentType, ContextType>
 	executedMigrations?: Resolver<ReadonlyArray<ResolversTypes['ExecutedMigration']>, ParentType, ContextType, RequireFields<QueryExecutedMigrationsArgs, never>>
@@ -548,7 +561,7 @@ export type UpdateEventResolvers<ContextType = any, ParentType extends Resolvers
 	appliedAt?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>
 	type?: Resolver<ResolversTypes['EventType'], ParentType, ContextType>
 	tableName?: Resolver<ResolversTypes['String'], ParentType, ContextType>
-	primaryKey?: Resolver<ReadonlyArray<ResolversTypes['String']>, ParentType, ContextType>
+	primaryKey?: Resolver<ReadonlyArray<ResolversTypes['PrimaryKey']>, ParentType, ContextType>
 	oldValues?: Resolver<ResolversTypes['Json'], ParentType, ContextType>
 	diffValues?: Resolver<ResolversTypes['Json'], ParentType, ContextType>
 	__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
@@ -569,6 +582,7 @@ export type Resolvers<ContextType = any> = {
 	MigrationModifyError?: MigrationModifyErrorResolvers<ContextType>
 	MigrationModifyResponse?: MigrationModifyResponseResolvers<ContextType>
 	Mutation?: MutationResolvers<ContextType>
+	PrimaryKey?: GraphQLScalarType
 	Query?: QueryResolvers<ContextType>
 	Stage?: StageResolvers<ContextType>
 	TruncateResponse?: TruncateResponseResolvers<ContextType>

package/tests/cases/integration/systemApi/projectInitializer.test.ts

@@ -1,13 +1,12 @@
 import { ApiTester } from '@contember/engine-api-tester'
 import { ProjectConfig, StageConfig } from '../../../../src'
-import { suite } from 'uvu'
-import * as assert from '../../../src/asserts'
+import { assert, test } from 'vitest'
+
 import { Logger } from '@contember/engine-common'
 
-const projectInitializerTest = suite('Project initializer')
 const nullLogger = new Logger(() => {})
 
-projectInitializerTest('create stage', async () => {
+test('create stage', async () => {
 	const prodStage: StageConfig = {
 		name: 'Prod',
 		slug: 'prod',
@@ -25,9 +24,8 @@ projectInitializerTest('create stage', async () => {
 
 	await tester.systemContainer.projectInitializer.initialize(tester.databaseContextFactory, project, nullLogger)
 	const createdStagesA = await tester.stages.refreshCreatedStages()
-	assert.contains(createdStagesA, 'prod')
+	assert.ok(createdStagesA.has('prod'))
 
 	await tester.cleanup()
 })
 
-projectInitializerTest.run()

package/tests/cases/migrations/2020-05-06-150000-composed-primary.test.ts

@@ -1,8 +1,7 @@
 import migration from '../../../src/migrations/2020-05-06-150000-composed-primary'
 import { createMigrationBuilder } from '@contember/database-migrations'
 import { sampleProject } from '@contember/engine-api-tester'
-import { test } from 'uvu'
-import * as assert from 'uvu/assert'
+import { test, assert } from 'vitest'
 
 test('many-has-many-primary migration sql', async () => {
 	const builder = createMigrationBuilder()
@@ -222,5 +221,3 @@ DROP FUNCTION "make_diff"("old" jsonb, "new" jsonb);
 `,
 	)
 })
-
-test.run()

package/tests/cases/migrations/2020-06-01-103000-event-trigger-perf.test.ts

@@ -1,8 +1,8 @@
 import migration from '../../../src/migrations/2020-06-01-103000-event-trigger-perf'
 import { createMigrationBuilder } from '@contember/database-migrations'
 import { sampleProject } from '@contember/engine-api-tester'
-import { test } from 'uvu'
-import * as assert from 'uvu/assert'
+import { test, assert } from 'vitest'
+
 
 test('event-trigger-performance sql', async () => {
 	const builder = createMigrationBuilder()
@@ -165,4 +165,3 @@ CREATE TRIGGER "log_event_statement"
 	)
 })
 
-test.run()

package/vite.config.js

@@ -0,0 +1,3 @@
+import { createViteConfig } from '../../scripts/vite/createViteConfig'
+
+export default createViteConfig()

package/dist/tests/src/asserts.d.ts

@@ -1,17 +0,0 @@
-import * as uvuAssert from 'uvu/assert';
-export * from 'uvu/assert';
-export declare function assert(bool: boolean, actual: any, expects: any, operator: string, detailer: false | ((actual: any, expected: any) => string), backup: string, msg?: uvuAssert.Message): void;
-export declare function throwsAsync(cb: Promise<any> | (() => Promise<any>), exp?: uvuAssert.Message | RegExp | Function, msg?: uvuAssert.Message): Promise<void>;
-export declare const contains: <T>(actual: Iterable<T> | T[], expects: T, msg?: uvuAssert.Message | undefined) => void;
-export declare const not: {
-    contains: <T>(actual: Iterable<T> | T[], expects: T, msg?: uvuAssert.Message | undefined) => void;
-    ok(actual: any, msg?: uvuAssert.Message | undefined): void;
-    equal(actual: any, expects: any, msg?: uvuAssert.Message | undefined): void;
-    type(actual: any, expects: uvuAssert.Types, msg?: uvuAssert.Message | undefined): void;
-    instance(actual: any, expects: any, msg?: uvuAssert.Message | undefined): void;
-    snapshot(actual: string, expects: string, msg?: uvuAssert.Message | undefined): void;
-    fixture(actual: string, expects: string, msg?: uvuAssert.Message | undefined): void;
-    match(actual: string, expects: string | RegExp, msg?: uvuAssert.Message | undefined): void;
-    throws(fn: Function, expects?: Function | RegExp | uvuAssert.Message | undefined, msg?: uvuAssert.Message | undefined): void;
-};
-//# sourceMappingURL=asserts.d.ts.map

package/dist/tests/src/asserts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"asserts.d.ts","sourceRoot":"","sources":["../../../tests/src/asserts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAA;AAEvC,cAAc,YAAY,CAAA;AAK1B,wBAAgB,MAAM,CACrB,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,KAAK,GAAG,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,KAAK,MAAM,CAAC,EAC1D,MAAM,EAAE,MAAM,EACd,GAAG,CAAC,EAAE,SAAS,CAAC,OAAO,QAWvB;AAMD,wBAAsB,WAAW,CAChC,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,EACvC,GAAG,CAAC,EAAE,SAAS,CAAC,OAAO,GAAG,MAAM,GAAG,QAAQ,EAC3C,GAAG,CAAC,EAAE,SAAS,CAAC,OAAO,iBA4BvB;AAED,eAAO,MAAM,QAAQ,qFAA8D,IAWlF,CAAA;AACD,eAAO,MAAM,GAAG;iGAEsD,IAAI;;;;;;;;;CAYzE,CAAA"}

package/dist/tests/src/asserts.js

@@ -1,81 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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 (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.not = exports.contains = exports.throwsAsync = exports.assert = void 0;
-const uvuAssert = __importStar(require("uvu/assert"));
-__exportStar(require("uvu/assert"), exports);
-/*
-based on https://github.com/lukeed/uvu/blob/30c10e038e5b99c993f26b93bf411c966a9896eb/src/assert.js#L26, because it is not exported
- */
-function assert(bool, actual, expects, operator, detailer, backup, msg) {
-    if (bool) {
-        return;
-    }
-    const message = msg || backup;
-    if (message instanceof Error) {
-        throw message;
-    }
-    const details = (detailer && detailer(actual, expects)) || undefined;
-    throw new uvuAssert.Assertion({ actual, expects, operator, message, details, generated: !msg });
-}
-exports.assert = assert;
-/*
-based on https://github.com/lukeed/uvu/blob/30c10e038e5b99c993f26b93bf411c966a9896eb/src/assert.js#L80
-with async function support
- */
-async function throwsAsync(cb, exp, msg) {
-    if (!msg && typeof exp === 'string') {
-        msg = exp;
-        exp = undefined;
-    }
-    try {
-        await (typeof cb === 'function' ? cb() : cb);
-        assert(false, false, true, 'throws', false, 'Expected function to throw', msg);
-    }
-    catch (err) {
-        if (err instanceof uvuAssert.Assertion)
-            throw err;
-        if (typeof exp === 'function') {
-            assert(exp(err), false, true, 'throws', false, 'Expected function to throw matching exception', msg);
-        }
-        else if (exp instanceof RegExp && err instanceof Error) {
-            let tmp = '`' + String(exp) + '`';
-            assert(exp.test(err.message), false, true, 'throws', false, `Expected function to throw exception matching ${tmp} pattern`, msg);
-        }
-    }
-}
-exports.throwsAsync = throwsAsync;
-const contains = (actual, expects, msg) => {
-    const actualArr = [...actual];
-    assert(actualArr.includes(expects), actualArr, expects, 'contains', false, 'Expected value to include the element', msg);
-};
-exports.contains = contains;
-exports.not = {
-    ...uvuAssert.not,
-    contains: (actual, expects, msg) => {
-        const actualArr = [...actual];
-        assert(!actualArr.includes(expects), actualArr, expects, 'not.contains', false, 'Expected value not to include the element', msg);
-    },
-};
-//# sourceMappingURL=asserts.js.map

package/dist/tests/src/asserts.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"asserts.js","sourceRoot":"","sources":["../../../tests/src/asserts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAuC;AAEvC,6CAA0B;AAE1B;;GAEG;AACH,SAAgB,MAAM,CACrB,IAAa,EACb,MAAW,EACX,OAAY,EACZ,QAAgB,EAChB,QAA0D,EAC1D,MAAc,EACd,GAAuB;IAEvB,IAAI,IAAI,EAAE;QACT,OAAM;KACN;IACD,MAAM,OAAO,GAAG,GAAG,IAAI,MAAM,CAAA;IAC7B,IAAI,OAAO,YAAY,KAAK,EAAE;QAC7B,MAAM,OAAO,CAAA;KACb;IACD,MAAM,OAAO,GAAG,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,SAAS,CAAA;IACpE,MAAM,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,CAAA;AAChG,CAAC;AAlBD,wBAkBC;AAED;;;GAGG;AACI,KAAK,UAAU,WAAW,CAChC,EAAuC,EACvC,GAA2C,EAC3C,GAAuB;IAEvB,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QACpC,GAAG,GAAG,GAAG,CAAA;QACT,GAAG,GAAG,SAAS,CAAA;KACf;IAED,IAAI;QACH,MAAM,CAAC,OAAO,EAAE,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QAC5C,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,4BAA4B,EAAE,GAAG,CAAC,CAAA;KAC9E;IAAC,OAAO,GAAG,EAAE;QACb,IAAI,GAAG,YAAY,SAAS,CAAC,SAAS;YAAE,MAAM,GAAG,CAAA;QAEjD,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;YAC9B,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,+CAA+C,EAAE,GAAG,CAAC,CAAA;SACpG;aAAM,IAAI,GAAG,YAAY,MAAM,IAAI,GAAG,YAAY,KAAK,EAAE;YACzD,IAAI,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAA;YACjC,MAAM,CACL,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EACrB,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,iDAAiD,GAAG,UAAU,EAC9D,GAAG,CACH,CAAA;SACD;KACD;AACF,CAAC;AA/BD,kCA+BC;AAEM,MAAM,QAAQ,GAAG,CAAI,MAAyB,EAAE,OAAU,EAAE,GAAa,EAAQ,EAAE;IACzF,MAAM,SAAS,GAAG,CAAC,GAAG,MAAM,CAAC,CAAA;IAC7B,MAAM,CACL,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAC3B,SAAS,EACT,OAAO,EACP,UAAU,EACV,KAAK,EACL,uCAAuC,EACvC,GAAG,CACH,CAAA;AACF,CAAC,CAAA;AAXY,QAAA,QAAQ,YAWpB;AACY,QAAA,GAAG,GAAG;IAClB,GAAG,SAAS,CAAC,GAAG;IAChB,QAAQ,EAAE,CAAI,MAAyB,EAAE,OAAU,EAAE,GAAa,EAAQ,EAAE;QAC3E,MAAM,SAAS,GAAG,CAAC,GAAG,MAAM,CAAC,CAAA;QAC7B,MAAM,CACL,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAC5B,SAAS,EACT,OAAO,EACP,cAAc,EACd,KAAK,EACL,2CAA2C,EAC3C,GAAG,CACH,CAAA;IACF,CAAC;CACD,CAAA"}

package/tests/src/asserts.ts

@@ -1,91 +0,0 @@
-import * as uvuAssert from 'uvu/assert'
-import { Message } from 'uvu/assert'
-export * from 'uvu/assert'
-
-/*
-based on https://github.com/lukeed/uvu/blob/30c10e038e5b99c993f26b93bf411c966a9896eb/src/assert.js#L26, because it is not exported
- */
-export function assert(
-	bool: boolean,
-	actual: any,
-	expects: any,
-	operator: string,
-	detailer: false | ((actual: any, expected: any) => string),
-	backup: string,
-	msg?: uvuAssert.Message,
-) {
-	if (bool) {
-		return
-	}
-	const message = msg || backup
-	if (message instanceof Error) {
-		throw message
-	}
-	const details = (detailer && detailer(actual, expects)) || undefined
-	throw new uvuAssert.Assertion({ actual, expects, operator, message, details, generated: !msg })
-}
-
-/*
-based on https://github.com/lukeed/uvu/blob/30c10e038e5b99c993f26b93bf411c966a9896eb/src/assert.js#L80
-with async function support
- */
-export async function throwsAsync(
-	cb: Promise<any> | (() => Promise<any>),
-	exp?: uvuAssert.Message | RegExp | Function,
-	msg?: uvuAssert.Message,
-) {
-	if (!msg && typeof exp === 'string') {
-		msg = exp
-		exp = undefined
-	}
-
-	try {
-		await (typeof cb === 'function' ? cb() : cb)
-		assert(false, false, true, 'throws', false, 'Expected function to throw', msg)
-	} catch (err) {
-		if (err instanceof uvuAssert.Assertion) throw err
-
-		if (typeof exp === 'function') {
-			assert(exp(err), false, true, 'throws', false, 'Expected function to throw matching exception', msg)
-		} else if (exp instanceof RegExp && err instanceof Error) {
-			let tmp = '`' + String(exp) + '`'
-			assert(
-				exp.test(err.message),
-				false,
-				true,
-				'throws',
-				false,
-				`Expected function to throw exception matching ${tmp} pattern`,
-				msg,
-			)
-		}
-	}
-}
-
-export const contains = <T>(actual: T[] | Iterable<T>, expects: T, msg?: Message): void => {
-	const actualArr = [...actual]
-	assert(
-		actualArr.includes(expects),
-		actualArr,
-		expects,
-		'contains',
-		false,
-		'Expected value to include the element',
-		msg,
-	)
-}
-export const not = {
-	...uvuAssert.not,
-	contains: <T>(actual: T[] | Iterable<T>, expects: T, msg?: Message): void => {
-		const actualArr = [...actual]
-		assert(
-			!actualArr.includes(expects),
-			actualArr,
-			expects,
-			'not.contains',
-			false,
-			'Expected value not to include the element',
-			msg,
-		)
-	},
-}