diff --git a/package-lock.json b/package-lock.json index c87c819..6f43664 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,21 +1,21 @@ { "name": "@pseinfo/database-schema", - "version": "0.1.1", + "version": "0.1.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@pseinfo/database-schema", - "version": "0.1.1", + "version": "0.1.2", "license": "MIT", "dependencies": { - "devtypes": "^1.0.1" + "devtypes": "^2.0.0" } }, "node_modules/devtypes": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/devtypes/-/devtypes-1.0.2.tgz", - "integrity": "sha512-KHQ3wquyfcYAntOuLJmGO5IBdto029IP4EMKuWgD1wI6M+3s3ic5jOxemZCtu3vmYEDKzvDYvkRwlTgokcgOfg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/devtypes/-/devtypes-2.0.0.tgz", + "integrity": "sha512-gAB7qGCwFNDsFbWMtXZSYd884Kvv7o7l/XK6MbvQi3IsoqI/6I+neV8PmJIStFUVn3MF7bnw1oKBMB6tfqCYTg==", "license": "MIT", "engines": { "node": ">=18.0.0" diff --git a/package.json b/package.json index 9be23d1..1a124fb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@pseinfo/database-schema", "description": "TypeScript type declarations for the @pseinfo database", - "version": "0.1.1", + "version": "0.1.2", "license": "MIT", "author": { "name": "Paul Köhler", @@ -17,8 +17,14 @@ "url": "https://github.com/pseinfo/database-schema/issues" }, "keywords": [ - "database", "schema", "chemistry", "types", "typescript", - "periodic-table", "type-definitions", "pseinfo" + "database", + "schema", + "chemistry", + "types", + "typescript", + "periodic-table", + "type-definitions", + "pseinfo" ], "type": "module", "types": "types/index.ts", @@ -46,7 +52,7 @@ "LICENSE" ], "dependencies": { - "devtypes": "^1.0.1" + "devtypes": "^2.0.0" }, "scripts": { "lint": "tsc" diff --git a/types/abstract/collection.ts b/types/abstract/collection.ts index 738a94b..5b253c9 100644 --- a/types/abstract/collection.ts +++ b/types/abstract/collection.ts @@ -3,7 +3,8 @@ * Utility types for defining collections of properties with various structures. */ -import { LiteralUnion } from 'devtypes/types/primitives'; +import { LiteralUnion } from 'devtypes/types/primitive'; + import { Property } from './property'; /** Utility types */ diff --git a/types/abstract/condition.ts b/types/abstract/condition.ts index a29d21f..5aaa259 100644 --- a/types/abstract/condition.ts +++ b/types/abstract/condition.ts @@ -3,7 +3,8 @@ * Defines a mapping of physical quantities as conditions for properties. */ -import { Primitive } from 'devtypes/types/primitives'; +import { Primitive } from 'devtypes/types/primitive'; + import { PhysicalQuantity } from './unit'; import { Value } from './value'; diff --git a/types/abstract/form.ts b/types/abstract/form.ts index e5c7efd..6dc11d7 100644 --- a/types/abstract/form.ts +++ b/types/abstract/form.ts @@ -3,9 +3,10 @@ * Defines the structure for various form types of substances. */ -import { Brand } from 'devtypes/types/base'; -import { DeepPartial } from 'devtypes/types/collections'; -import { RequireFrom, StrictSubset } from 'devtypes/types/constraints'; +import { RequireFrom, StrictSubset } from 'devtypes/types/constraint'; +import { DeepPartial } from 'devtypes/types/transform'; +import { Brand } from 'devtypes/types/util'; + import { CrystalStructure, Phase } from '../utils/const'; import { Collection, Distinct } from './collection'; diff --git a/types/abstract/property.ts b/types/abstract/property.ts index 4940479..e49a490 100644 --- a/types/abstract/property.ts +++ b/types/abstract/property.ts @@ -3,7 +3,8 @@ * Definitions for various property types used in the database schema. */ -import { Primitive } from 'devtypes/types/primitives'; +import { Primitive } from 'devtypes/types/primitive'; + import { Conditions } from './condition'; import { RefId } from './reference'; import { PhysicalQuantity } from './unit'; diff --git a/types/abstract/reference.ts b/types/abstract/reference.ts index e83f941..249dcc6 100644 --- a/types/abstract/reference.ts +++ b/types/abstract/reference.ts @@ -3,8 +3,8 @@ * Types and structures for bibliographic references based on BibTeX. */ -import { Brand } from 'devtypes/types/base'; -import { ExtractFrom, RequireAtLeastOne, RequireExactlyOne, StrictSubset } from 'devtypes/types/constraints'; +import { ExtractFrom, RequireAtLeastOne, RequireExactlyOne, StrictSubset } from 'devtypes/types/constraint'; +import { Brand } from 'devtypes/types/util'; /** Reference types based on BibTeX */ export const ReferenceType = [ diff --git a/types/abstract/uncertainty.ts b/types/abstract/uncertainty.ts index 82c328f..bb23c2b 100644 --- a/types/abstract/uncertainty.ts +++ b/types/abstract/uncertainty.ts @@ -3,8 +3,8 @@ * Physical and measurement uncertainty representations. */ -import { Brand } from 'devtypes/types/base'; -import { RequireFrom } from 'devtypes/types/constraints'; +import { RequireFrom } from 'devtypes/types/constraint'; +import { Brand } from 'devtypes/types/util'; /** Uncertainty types */ export const UncertaintyType = [ 'absolute', 'relative', 'asymmetrical' ] as const; diff --git a/types/abstract/unit.ts b/types/abstract/unit.ts index f9ab1f4..142e8df 100644 --- a/types/abstract/unit.ts +++ b/types/abstract/unit.ts @@ -3,7 +3,7 @@ * Type system for physical units. */ -import { Brand } from 'devtypes/types/base'; +import { Brand } from 'devtypes/types/util'; /** Metric systems */ export const MetricSystem = [ 'metric', 'imperial', 'us', 'custom', 'unknown' ] as const; diff --git a/types/abstract/value.ts b/types/abstract/value.ts index 6bac3b9..7ecc4da 100644 --- a/types/abstract/value.ts +++ b/types/abstract/value.ts @@ -3,9 +3,10 @@ * Definitions for various types of values used in the schema. */ -import { Brand } from 'devtypes/types/base'; -import { RequireAtLeastOne, RequireExactlyOne, StrictSubset } from 'devtypes/types/constraints'; -import { Primitive } from 'devtypes/types/primitives'; +import { RequireAtLeastOne, RequireExactlyOne, StrictSubset } from 'devtypes/types/constraint'; +import { Primitive } from 'devtypes/types/primitive'; +import { Brand } from 'devtypes/types/util'; + import { Uncertainty } from './uncertainty'; import { PhysicalQuantity, UnitId } from './unit';