fix(monorepo): Resolve inter-repo dependencies issues

storm-software · Dec 12, 2023 · 750b10a · 750b10a
1 parent 9f458e4
commit 750b10a
Show file tree

Hide file tree

Showing 20 changed files with 76 additions and 20 deletions.
diff --git a/docs/api-reports/packages/serialization/api-report.md b/docs/api-reports/packages/serialization/api-report.md
@@ -190,7 +190,7 @@ export { register as register_alias_1 };
 
 // @public (undocumented)
 const Serializable: <TData = any>(options: {
-  name: string;
+  name?: string | undefined;
   serialize: SerializationFunct<TData>;
   deserialize: DeserializeFunct<TData>;
 }) => <TClass extends new (...args: any) => any = new (...args: any) => TData>(

diff --git a/docs/api-reports/packages/serialization/documents-model.api.json b/docs/api-reports/packages/serialization/documents-model.api.json
@@ -1710,7 +1710,7 @@
             },
             {
               "kind": "Content",
-              "text": "<TData = any>(options: {\n    name: string;\n    serialize: "
+              "text": "<TData = any>(options: {\n    name?: string | undefined;\n    serialize: "
             },
             {
               "kind": "Reference",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -16,8 +16,16 @@
     "console-table-printer": "2.11.2"
   },
   "devDependencies": {
+    "@storm-stack/logging": "*",
+    "@storm-stack/serialization": "*",
+    "@storm-stack/utilities": "*",
     "@types/node": "^20.10.4"
   },
+  "peerDependencies": {
+    "@storm-stack/logging": "workspace:*",
+    "@storm-stack/serialization": "workspace:*",
+    "@storm-stack/utilities": "workspace:*"
+  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/date-time/package.json b/packages/date-time/package.json
@@ -12,6 +12,16 @@
   "dependencies": {
     "@js-temporal/polyfill": "0.4.4"
   },
+  "devDependencies": {
+    "@storm-stack/errors": "*",
+    "@storm-stack/serialization": "*",
+    "@storm-stack/utilities": "*"
+  },
+  "peerDependencies": {
+    "@storm-stack/errors": "workspace:*",
+    "@storm-stack/serialization": "workspace:*",
+    "@storm-stack/utilities": "workspace:*"
+  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/date-time/src/storm-date-time.ts b/packages/date-time/src/storm-date-time.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { Temporal } from "@js-temporal/polyfill";
 import { Serializable } from "@storm-stack/serialization";
 import { isBigInt } from "@storm-stack/utilities/type-checks/is-bigint";
@@ -52,7 +51,6 @@ export type DateTimeInput =
  * @decorator `@Serializable()`
  */
 @Serializable({
-  name: "StormDateTime",
   serialize: serializeStormDateTime,
   deserialize: deserializeStormDateTime
 })

diff --git a/packages/date-time/src/storm-date.ts b/packages/date-time/src/storm-date.ts
@@ -16,7 +16,6 @@ import { validateDate } from "./utilities/validate-date";
  * @decorator `@Serializable()`
  */
 @Serializable({
-  name: "StormDate",
   serialize: serializeStormDate,
   deserialize: deserializeStormDate
 })

diff --git a/packages/date-time/src/storm-time.ts b/packages/date-time/src/storm-time.ts
@@ -16,7 +16,6 @@ import {
  * @decorator `@Serializable()`
  */
 @Serializable({
-  name: "StormTime",
   serialize: serializeStormTime,
   deserialize: deserializeStormTime
 })

diff --git a/packages/date-time/src/utilities/format-date-time-iso.ts b/packages/date-time/src/utilities/format-date-time-iso.ts
@@ -1,5 +1,5 @@
 import { Temporal } from "@js-temporal/polyfill";
-import { EMPTY_STRING } from "@storm-stack/utilities";
+import { EMPTY_STRING } from "@storm-stack/utilities/types";
 import { StormDateTime } from "../storm-date-time";
 
 /**

diff --git a/packages/date-time/src/utilities/format-date-time.ts b/packages/date-time/src/utilities/format-date-time.ts
@@ -1,5 +1,5 @@
 import { Temporal } from "@js-temporal/polyfill";
-import { EMPTY_STRING } from "@storm-stack/utilities";
+import { EMPTY_STRING } from "@storm-stack/utilities/types";
 import { StormDateTime } from "../storm-date-time";
 
 /**

diff --git a/packages/date-time/src/utilities/format-since.ts b/packages/date-time/src/utilities/format-since.ts
@@ -1,5 +1,5 @@
 import { Temporal } from "@js-temporal/polyfill";
-import { StormError } from "@storm-stack/errors";
+import { StormError } from "@storm-stack/errors/storm-error";
 import { DateTimeErrorCode } from "../errors";
 import { StormDate } from "../storm-date";
 import { StormDateTime } from "../storm-date-time";

diff --git a/packages/date-time/src/utilities/serialization.ts b/packages/date-time/src/utilities/serialization.ts
@@ -1,5 +1,5 @@
 import { JsonValue } from "@storm-stack/serialization/types";
-import { isSetString } from "@storm-stack/utilities";
+import { isSetString } from "@storm-stack/utilities/type-checks/is-set-string";
 import { StormDate } from "../storm-date";
 import { StormDateTime } from "../storm-date-time";
 import { StormTime } from "../storm-time";

diff --git a/packages/date-time/src/utilities/validate-date-time.ts b/packages/date-time/src/utilities/validate-date-time.ts
@@ -1,5 +1,6 @@
-import { isBigInt, isNumber } from "@storm-stack/utilities";
+import { isBigInt } from "@storm-stack/utilities/type-checks/is-bigint";
 import { isDate } from "@storm-stack/utilities/type-checks/is-date";
+import { isNumber } from "@storm-stack/utilities/type-checks/is-number";
 import { RFC_3339_DATETIME_REGEX } from "../constants";
 import { DateTimeInput, DateTimeOptions } from "../storm-date-time";
 import { isDateTime } from "./is-date-time";

diff --git a/packages/date-time/src/utilities/validate-time.ts b/packages/date-time/src/utilities/validate-time.ts
@@ -1,4 +1,6 @@
-import { isBigInt, isDate, isNumber } from "@storm-stack/utilities";
+import { isBigInt } from "@storm-stack/utilities/type-checks/is-bigint";
+import { isDate } from "@storm-stack/utilities/type-checks/is-date";
+import { isNumber } from "@storm-stack/utilities/type-checks/is-number";
 import { RFC_3339_TIME_REGEX } from "../constants";
 import { DateTimeInput, DateTimeOptions } from "../storm-date-time";
 import { isDateTime } from "./is-date-time";

diff --git a/packages/errors/package.json b/packages/errors/package.json
@@ -14,6 +14,14 @@
     "@storm-software/workspace-tools": "latest",
     "stacktracey": "2.1.8"
   },
+  "devDependencies": {
+    "@storm-stack/serialization": "*",
+    "@storm-stack/utilities": "*"
+  },
+  "peerDependencies": {
+    "@storm-stack/serialization": "workspace:*",
+    "@storm-stack/utilities": "workspace:*"
+  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/errors/src/storm-error.ts b/packages/errors/src/storm-error.ts
@@ -101,7 +101,6 @@ export function getCauseFromUnknown(cause: unknown): StormError {
  * @decorator `@Serializable()`
  */
 @Serializable({
-  name: "StormError",
   serialize: serializeStormError,
   deserialize: deserializeStormError
 })

diff --git a/packages/file-system/package.json b/packages/file-system/package.json
@@ -13,9 +13,21 @@
     "semver": "7.5.4"
   },
   "devDependencies": {
+    "@storm-stack/cli": "*",
+    "@storm-stack/errors": "*",
+    "@storm-stack/logging": "*",
+    "@storm-stack/serialization": "*",
+    "@storm-stack/utilities": "*",
     "@types/node": "^20.10.4",
     "@types/semver": "7.5.6"
   },
+  "peerDependencies": {
+    "@storm-stack/cli": "workspace:*",
+    "@storm-stack/errors": "workspace:*",
+    "@storm-stack/logging": "workspace:*",
+    "@storm-stack/serialization": "workspace:*",
+    "@storm-stack/utilities": "workspace:*"
+  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/logging/package.json b/packages/logging/package.json
@@ -18,8 +18,18 @@
     "zod": "3.22.4"
   },
   "devDependencies": {
+    "@storm-stack/date-time": "*",
+    "@storm-stack/errors": "*",
+    "@storm-stack/logging": "*",
+    "@storm-stack/utilities": "*",
     "@types/node": "^20.10.4"
   },
+  "peerDependencies": {
+    "@storm-stack/date-time": "workspace:*",
+    "@storm-stack/errors": "workspace:*",
+    "@storm-stack/logging": "workspace:*",
+    "@storm-stack/utilities": "workspace:*"
+  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/serialization/package.json b/packages/serialization/package.json
@@ -14,9 +14,13 @@
     "superjson": "2.2.1"
   },
   "devDependencies": {
+    "@storm-stack/utilities": "*",
     "@types/node": "^20.10.4",
     "@types/qs": "6.9.10"
   },
+  "peerDependencies": {
+    "@storm-stack/utilities": "workspace:*"
+  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/serialization/src/serializable.ts b/packages/serialization/src/serializable.ts
@@ -11,7 +11,7 @@ export const Serializable = <TData = any>(options: {
   /**
    * The type and/or name of the record
    */
-  name: string;
+  name?: string;
 
   /**
    * Serialize the class to a JSON object or string
@@ -34,25 +34,25 @@ export const Serializable = <TData = any>(options: {
   >(
     target: TClass
   ) => {
+    const name = options.name ? options.name : target.name;
+
     let isTypeOf!: ClassTypeCheckable<TData>["isTypeOf"];
-    if (
-      isFunction((target?.prototype as ClassTypeCheckable<TData>)?.isTypeOf)
-    ) {
-      isTypeOf = (target?.prototype as ClassTypeCheckable<TData>).isTypeOf;
+    if (isFunction((target.prototype as ClassTypeCheckable<TData>)?.isTypeOf)) {
+      isTypeOf = (target.prototype as ClassTypeCheckable<TData>).isTypeOf;
     } else {
       isTypeOf = (value: any): value is TData =>
         value instanceof target || value?.__typename === name;
     }
 
-    register(options.name, options.serialize, options.deserialize, isTypeOf);
+    register(name, options.serialize, options.deserialize, isTypeOf);
     return class
       extends target
       implements ClassSerializable<TData>, ClassTypeCheckable<TData>, ITyped
     {
       /**
        * The name of the class's type
        */
-      public __typename = options.name;
+      public __typename = name;
 
       /**
        * Serialize the class to a JSON object

diff --git a/packages/unique-identifier/package.json b/packages/unique-identifier/package.json
@@ -12,6 +12,12 @@
   "dependencies": {
     "@noble/hashes": "1.3.2"
   },
+  "devDependencies": {
+    "@storm-stack/utilities": "*"
+  },
+  "peerDependencies": {
+    "@storm-stack/utilities": "workspace:*"
+  },
   "publishConfig": {
     "access": "public"
   }