feat(primitives): expose FHIR versioning

Only providing R4 for now.
tangdrew · Jan 25, 2019 · f40d24d · f40d24d
1 parent d7fe4c4
commit f40d24d
Show file tree

Hide file tree

Showing 42 changed files with 88 additions and 81 deletions.
diff --git a/packages/primitives/package.json b/packages/primitives/package.json
@@ -37,7 +37,7 @@
     "transform": {
       "^.+\\.tsx?$": "ts-jest"
     },
-    "testRegex": "(/__tests__/.*|\\.(test))\\.(ts|tsx|js)$",
+    "testRegex": "test/.*.test.ts",
     "moduleFileExtensions": [
       "ts",
       "tsx",

diff --git a/packages/primitives/src/base64binary.ts → packages/primitives/src/R4/base64binary.ts b/packages/primitives/src/base64binary.ts → packages/primitives/src/R4/base64binary.ts
diff --git a/packages/primitives/src/boolean.ts → packages/primitives/src/R4/boolean.ts b/packages/primitives/src/boolean.ts → packages/primitives/src/R4/boolean.ts
diff --git a/packages/primitives/src/canonical.ts → packages/primitives/src/R4/canonical.ts b/packages/primitives/src/canonical.ts → packages/primitives/src/R4/canonical.ts
diff --git a/packages/primitives/src/code.ts → packages/primitives/src/R4/code.ts b/packages/primitives/src/code.ts → packages/primitives/src/R4/code.ts
diff --git a/packages/primitives/src/date.ts → packages/primitives/src/R4/date.ts b/packages/primitives/src/date.ts → packages/primitives/src/R4/date.ts
diff --git a/packages/primitives/src/dateTime.ts → packages/primitives/src/R4/dateTime.ts b/packages/primitives/src/dateTime.ts → packages/primitives/src/R4/dateTime.ts
diff --git a/packages/primitives/src/decimal.ts → packages/primitives/src/R4/decimal.ts b/packages/primitives/src/decimal.ts → packages/primitives/src/R4/decimal.ts
@@ -10,7 +10,7 @@ import { Type, success, failure } from "io-ts";
  */
 export class Decimal extends Big {
   private dp: number;
-  constructor(n) {
+  constructor(n: string | number) {
     super(n);
     this.dp = this.decimalPlaces(n);
   }

diff --git a/packages/primitives/src/id.ts → packages/primitives/src/R4/id.ts b/packages/primitives/src/id.ts → packages/primitives/src/R4/id.ts
diff --git a/packages/primitives/src/R4/index.ts b/packages/primitives/src/R4/index.ts
@@ -0,0 +1,64 @@
+/**
+ * FHIR R4 Primitive Runtime Types
+ */
+
+import { Base64BinaryType, base64binary } from "./base64binary";
+import { BooleanType, boolean } from "./boolean";
+import { CanonicalType, canonical } from "./canonical";
+import { CodeType, code } from "./code";
+import { DateType, date } from "./date";
+import { DateTimeType, dateTime } from "./dateTime";
+import { DecimalType, decimal } from "./decimal";
+import { IDType, id } from "./id";
+import { InstantType, instant } from "./instant";
+import { IntegerType, integer } from "./integer";
+import { MarkdownType, markdown } from "./markdown";
+import { OIDType, oid } from "./oid";
+import { PositiveIntegerType, positiveInt } from "./positiveInt";
+import { StringType, string } from "./string";
+import { TimeType, time } from "./time";
+import { UnsignedIntegerType, unsignedInt } from "./unsignedInt";
+import { URIType, uri } from "./uri";
+import { URLType, url } from "./url";
+import { UUIDType, uuid } from "./uuid";
+
+export {
+  base64binary,
+  Base64BinaryType,
+  boolean,
+  BooleanType,
+  canonical,
+  CanonicalType,
+  code,
+  CodeType,
+  date,
+  DateType,
+  dateTime,
+  DateTimeType,
+  decimal,
+  DecimalType,
+  id,
+  IDType,
+  instant,
+  InstantType,
+  integer,
+  IntegerType,
+  markdown,
+  MarkdownType,
+  oid,
+  OIDType,
+  positiveInt,
+  PositiveIntegerType,
+  string,
+  StringType,
+  time,
+  TimeType,
+  unsignedInt,
+  UnsignedIntegerType,
+  uri,
+  URIType,
+  url,
+  URLType,
+  uuid,
+  UUIDType
+};
diff --git a/packages/primitives/src/instant.ts → packages/primitives/src/R4/instant.ts b/packages/primitives/src/instant.ts → packages/primitives/src/R4/instant.ts
diff --git a/packages/primitives/src/integer.ts → packages/primitives/src/R4/integer.ts b/packages/primitives/src/integer.ts → packages/primitives/src/R4/integer.ts
diff --git a/packages/primitives/src/markdown.ts → packages/primitives/src/R4/markdown.ts b/packages/primitives/src/markdown.ts → packages/primitives/src/R4/markdown.ts
diff --git a/packages/primitives/src/oid.ts → packages/primitives/src/R4/oid.ts b/packages/primitives/src/oid.ts → packages/primitives/src/R4/oid.ts
diff --git a/packages/primitives/src/positiveInt.ts → packages/primitives/src/R4/positiveInt.ts b/packages/primitives/src/positiveInt.ts → packages/primitives/src/R4/positiveInt.ts
diff --git a/packages/primitives/src/string.ts → packages/primitives/src/R4/string.ts b/packages/primitives/src/string.ts → packages/primitives/src/R4/string.ts
diff --git a/packages/primitives/src/time.ts → packages/primitives/src/R4/time.ts b/packages/primitives/src/time.ts → packages/primitives/src/R4/time.ts
diff --git a/packages/primitives/src/unsignedInt.ts → packages/primitives/src/R4/unsignedInt.ts b/packages/primitives/src/unsignedInt.ts → packages/primitives/src/R4/unsignedInt.ts
diff --git a/packages/primitives/src/uri.ts → packages/primitives/src/R4/uri.ts b/packages/primitives/src/uri.ts → packages/primitives/src/R4/uri.ts
diff --git a/packages/primitives/src/url.ts → packages/primitives/src/R4/url.ts b/packages/primitives/src/url.ts → packages/primitives/src/R4/url.ts
diff --git a/packages/primitives/src/uuid.ts → packages/primitives/src/R4/uuid.ts b/packages/primitives/src/uuid.ts → packages/primitives/src/R4/uuid.ts
diff --git a/packages/primitives/src/index.ts b/packages/primitives/src/index.ts
@@ -2,63 +2,6 @@
  * FHIR Primitive Runtime Types
  */
 
-import { Base64BinaryType, base64binary } from "./base64binary";
-import { BooleanType, boolean } from "./boolean";
-import { CanonicalType, canonical } from "./canonical";
-import { CodeType, code } from "./code";
-import { DateType, date } from "./date";
-import { DateTimeType, dateTime } from "./dateTime";
-import { DecimalType, decimal } from "./decimal";
-import { IDType, id } from "./id";
-import { InstantType, instant } from "./instant";
-import { IntegerType, integer } from "./integer";
-import { MarkdownType, markdown } from "./markdown";
-import { OIDType, oid } from "./oid";
-import { PositiveIntegerType, positiveInt } from "./positiveInt";
-import { StringType, string } from "./string";
-import { TimeType, time } from "./time";
-import { UnsignedIntegerType, unsignedInt } from "./unsignedInt";
-import { URIType, uri } from "./uri";
-import { URLType, url } from "./url";
-import { UUIDType, uuid } from "./uuid";
+import * as R4 from "./R4";
 
-export {
-  base64binary,
-  Base64BinaryType,
-  boolean,
-  BooleanType,
-  canonical,
-  CanonicalType,
-  code,
-  CodeType,
-  date,
-  DateType,
-  dateTime,
-  DateTimeType,
-  decimal,
-  DecimalType,
-  id,
-  IDType,
-  instant,
-  InstantType,
-  integer,
-  IntegerType,
-  markdown,
-  MarkdownType,
-  oid,
-  OIDType,
-  positiveInt,
-  PositiveIntegerType,
-  string,
-  StringType,
-  time,
-  TimeType,
-  unsignedInt,
-  UnsignedIntegerType,
-  uri,
-  URIType,
-  url,
-  URLType,
-  uuid,
-  UUIDType
-};
+export { R4 };
diff --git a/...ages/primitives/test/base64binary.test.ts → ...s/primitives/test/R4/base64binary.test.ts b/...ages/primitives/test/base64binary.test.ts → ...s/primitives/test/R4/base64binary.test.ts
@@ -2,7 +2,7 @@
  * Tests for Base64Binary Runtime Type
  */
 
-import { base64binary } from "../src";
+import { base64binary } from "../../src/R4";
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
 
 describe("Base64BinaryType", () => {

diff --git a/packages/primitives/test/boolean.test.ts → packages/primitives/test/R4/boolean.test.ts b/packages/primitives/test/boolean.test.ts → packages/primitives/test/R4/boolean.test.ts
@@ -2,7 +2,7 @@
  * Tests for Boolean Runtime Type
  */
 
-import { boolean } from "../src";
+import { boolean } from "../../src/R4";
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
 
 describe("BooleanType", () => {

diff --git a/packages/primitives/test/canonical.test.ts → ...ages/primitives/test/R4/canonical.test.ts b/packages/primitives/test/canonical.test.ts → ...ages/primitives/test/R4/canonical.test.ts
@@ -3,7 +3,7 @@
  */
 
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
-import { canonical } from "../src";
+import { canonical } from "../../src/R4";
 
 describe("CanonicalType", () => {
   it("should succeed validating a valid value", () => {

diff --git a/packages/primitives/test/code.test.ts → packages/primitives/test/R4/code.test.ts b/packages/primitives/test/code.test.ts → packages/primitives/test/R4/code.test.ts
@@ -2,7 +2,7 @@
  * Tests for Code Runtime Type
  */
 
-import { code } from "../src";
+import { code } from "../../src/R4";
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
 
 describe("CodeType", () => {

diff --git a/packages/primitives/test/date.test.ts → packages/primitives/test/R4/date.test.ts b/packages/primitives/test/date.test.ts → packages/primitives/test/R4/date.test.ts
@@ -2,7 +2,7 @@
  * Tests for Date Runtime Type
  */
 
-import { date } from "../src";
+import { date } from "../../src/R4";
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
 
 describe("DateType", () => {

diff --git a/packages/primitives/test/dateTime.test.ts → packages/primitives/test/R4/dateTime.test.ts b/packages/primitives/test/dateTime.test.ts → packages/primitives/test/R4/dateTime.test.ts
@@ -2,7 +2,7 @@
  * Tests for DateTime Runtime Type
  */
 
-import { dateTime } from "../src";
+import { dateTime } from "../../src/R4";
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
 
 describe("DateTimeType", () => {

diff --git a/packages/primitives/test/decimal.test.ts → packages/primitives/test/R4/decimal.test.ts b/packages/primitives/test/decimal.test.ts → packages/primitives/test/R4/decimal.test.ts
@@ -3,8 +3,8 @@
  */
 
 import { assertSuccess, assertFailure } from "./helpers";
-import { decimal } from "../src";
-import { Decimal } from "../src/decimal";
+import { decimal } from "../../src/R4";
+import { Decimal } from "../../src/R4/decimal";
 
 describe("DecimalType", () => {
   it("should succeed validating a valid value", () => {

diff --git a/packages/primitives/test/helpers.ts → packages/primitives/test/R4/helpers.ts b/packages/primitives/test/helpers.ts → packages/primitives/test/R4/helpers.ts
diff --git a/packages/primitives/test/id.test.ts → packages/primitives/test/R4/id.test.ts b/packages/primitives/test/id.test.ts → packages/primitives/test/R4/id.test.ts
@@ -3,7 +3,7 @@
  */
 
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
-import { id } from "../src";
+import { id } from "../../src/R4";
 
 describe("IDType", () => {
   it("should succeed validating a valid value", () => {

diff --git a/packages/primitives/test/instant.test.ts → packages/primitives/test/R4/instant.test.ts b/packages/primitives/test/instant.test.ts → packages/primitives/test/R4/instant.test.ts
@@ -2,7 +2,7 @@
  * Tests for Instant Runtime Type
  */
 
-import { instant } from "../src";
+import { instant } from "../../src/R4";
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
 
 describe("InstantType", () => {

diff --git a/packages/primitives/test/integer.test.ts → packages/primitives/test/R4/integer.test.ts b/packages/primitives/test/integer.test.ts → packages/primitives/test/R4/integer.test.ts
@@ -2,7 +2,7 @@
  * Tests for Integer Runtime Type
  */
 
-import { integer } from "../src";
+import { integer } from "../../src/R4";
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
 
 describe("IntegerType", () => {

diff --git a/packages/primitives/test/markdown.test.ts → packages/primitives/test/R4/markdown.test.ts b/packages/primitives/test/markdown.test.ts → packages/primitives/test/R4/markdown.test.ts
@@ -2,7 +2,7 @@
  * Tests for Markdown Runtime Type
  */
 
-import { markdown } from "../src";
+import { markdown } from "../../src/R4";
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
 
 describe("MarkdownType", () => {

diff --git a/packages/primitives/test/oid.test.ts → packages/primitives/test/R4/oid.test.ts b/packages/primitives/test/oid.test.ts → packages/primitives/test/R4/oid.test.ts
@@ -3,7 +3,7 @@
  */
 
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
-import { oid } from "../src";
+import { oid } from "../../src/R4";
 
 describe("OIDType", () => {
   it("should succeed validating a valid value", () => {

diff --git a/packages/primitives/test/positiveInt.test.ts → ...es/primitives/test/R4/positiveInt.test.ts b/packages/primitives/test/positiveInt.test.ts → ...es/primitives/test/R4/positiveInt.test.ts
@@ -2,7 +2,7 @@
  * Tests for Postive Integer Runtime Type
  */
 
-import { positiveInt } from "../src";
+import { positiveInt } from "../../src/R4";
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
 
 describe("PositiveIntegerType", () => {

diff --git a/packages/primitives/test/string.test.ts → packages/primitives/test/R4/string.test.ts b/packages/primitives/test/string.test.ts → packages/primitives/test/R4/string.test.ts
@@ -2,7 +2,7 @@
  * Tests for String Runtime Type
  */
 
-import { string } from "../src";
+import { string } from "../../src/R4";
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
 
 describe("StringType", () => {

diff --git a/packages/primitives/test/time.test.ts → packages/primitives/test/R4/time.test.ts b/packages/primitives/test/time.test.ts → packages/primitives/test/R4/time.test.ts
@@ -2,7 +2,7 @@
  * Tests for Time Runtime Type
  */
 
-import { time } from "../src";
+import { time } from "../../src/R4";
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
 
 describe("TimeType", () => {

diff --git a/packages/primitives/test/unsignedInt.ts → packages/primitives/test/R4/unsignedInt.ts b/packages/primitives/test/unsignedInt.ts → packages/primitives/test/R4/unsignedInt.ts
@@ -2,7 +2,7 @@
  * Tests for Unsigned Integer Runtime Type
  */
 
-import { unsignedInt } from "../src";
+import { unsignedInt } from "../../src/R4";
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
 
 describe("UnsignedIntegerType", () => {

diff --git a/packages/primitives/test/uri.test.ts → packages/primitives/test/R4/uri.test.ts b/packages/primitives/test/uri.test.ts → packages/primitives/test/R4/uri.test.ts
@@ -3,7 +3,7 @@
  */
 
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
-import { uri } from "../src";
+import { uri } from "../../src/R4";
 
 describe("URIType", () => {
   it("should succeed validating a valid value", () => {

diff --git a/packages/primitives/test/url.test.ts → packages/primitives/test/R4/url.test.ts b/packages/primitives/test/url.test.ts → packages/primitives/test/R4/url.test.ts
@@ -3,7 +3,7 @@
  */
 
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
-import { url } from "../src";
+import { url } from "../../src/R4";
 
 describe("URLType", () => {
   it("should succeed validating a valid value", () => {

diff --git a/packages/primitives/test/uuid.test.ts → packages/primitives/test/R4/uuid.test.ts b/packages/primitives/test/uuid.test.ts → packages/primitives/test/R4/uuid.test.ts
@@ -3,7 +3,7 @@
  */
 
 import { assertSuccess, assertFailure, assertStrictEqual } from "./helpers";
-import { uuid } from "../src";
+import { uuid } from "../../src/R4";
 
 describe("UUIDType", () => {
   it("should succeed validating a valid value", () => {