Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 10 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -46,7 +52,7 @@
"LICENSE"
],
"dependencies": {
"devtypes": "^1.0.1"
"devtypes": "^2.0.0"
},
"scripts": {
"lint": "tsc"
Expand Down
3 changes: 2 additions & 1 deletion types/abstract/collection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
3 changes: 2 additions & 1 deletion types/abstract/condition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
7 changes: 4 additions & 3 deletions types/abstract/form.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
3 changes: 2 additions & 1 deletion types/abstract/property.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions types/abstract/reference.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
4 changes: 2 additions & 2 deletions types/abstract/uncertainty.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion types/abstract/unit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 4 additions & 3 deletions types/abstract/value.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down