@hedia/types 1.2.4 → 1.2.6

package/.github/workflows/publish.yml

@@ -0,0 +1,41 @@
+name: NPM Publish Bot
+
+on:
+  push:
+    branches:
+      - main
+      - master
+
+env:
+  SSH_PRIVATE_KEY: ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
+  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.15] #[8.x, 10.x, 12.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1.4.4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Register ssh keys
+        uses: webfactory/ssh-agent@v0.4.1
+        with:
+          ssh-private-key: ${{ env.SSH_PRIVATE_KEY }}
+      - name: Register NPM access token
+        run: npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
+      - id: publish
+        uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ env.NPM_TOKEN }}
+
+      - if: steps.publish.outputs.type == 'none'
+        run: |
+          echo "Failed to publish on npm, version already exists"
+          exit 1

package/.github/workflows/version-check.yml

@@ -0,0 +1,42 @@
+name: Node.js CI
+
+on:
+  pull_request:
+
+env:
+  SSH_PRIVATE_KEY: ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
+  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.15] #[8.x, 10.x, 12.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1.4.4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Register ssh keys
+        uses: webfactory/ssh-agent@v0.4.1
+        with:
+          ssh-private-key: |
+            ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
+      - name: Register NPM access token
+        run: npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
+        env:
+          NPM_TOKEN: ${{ env.NPM_TOKEN }}
+      - id: publish
+        uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ env.NPM_TOKEN }}
+          dry-run: true
+
+      - if: steps.publish.outputs.type == 'none'
+        run: |
+          echo "Package JSON version is already published, please bump the version!"
+          exit 1

package/dist/types/activity/activity.d.ts

@@ -1,18 +1,23 @@
 export declare namespace Activity {
     namespace Types {
+        export type ActivitySettings = ActivityReductionSettings & ActivityTarget;
+        export type ActivityReductionIntervals = ActivityReductionSettings[keyof ActivityReductionSettings];
         type ActivityIntensityKeys = keyof typeof Enums.ActivityIntensity;
         type ActivityReductionKeys = keyof typeof Enums.ActivityReductionIntervals;
-        type ActivityReductionSettings = {
-            [key in ActivityIntensityKeys]: ActivityReductionSettingsIntervals<key, "hard", "fromFortysix">;
+        type ActivityReductionSettings = ActivityPostReduction & {
+            [key in ActivityIntensityKeys]: ActivityReductionSettingsIntervals<key, `hard`, `fromFortysix`>;
         };
-        export type ActivitySettings = ActivityReductionSettings & {
+        type ActivityPostReduction = {
+            post: {
+                [key in ActivityReductionKeys]: number;
+            };
+        };
+        type ActivityTarget = {
             target: number;
         };
         type ActivityReductionSettingsIntervals<K extends ActivityIntensityKeys, T extends ActivityIntensityKeys, U extends ActivityReductionKeys> = {
             [key in ActivityReductionKeys]: K extends T ? (key extends U ? null | number : number) : number;
         };
-        type ActivitySettingsOmitTarget = Omit<ActivitySettings, "target">;
-        export type ActivityReductionIntervals = ActivitySettingsOmitTarget[keyof ActivitySettingsOmitTarget];
         export {};
     }
     namespace Enums {
@@ -24,8 +29,14 @@ export declare namespace Activity {
         enum ActivityIntensity {
             light = "light",
             moderate = "moderate",
-            hard = "hard",
-            post = "post"
+            hard = "hard"
+        }
+        enum ActivityEnum {
+            Run = "Run",
+            Walk = "Walk",
+            Cycling = "Cycling",
+            Swim = "Swim",
+            Other = "Other"
         }
     }
 }

package/dist/types/activity/activity.js

@@ -16,8 +16,15 @@ var Activity;
             ActivityIntensity["light"] = "light";
             ActivityIntensity["moderate"] = "moderate";
             ActivityIntensity["hard"] = "hard";
-            ActivityIntensity["post"] = "post";
         })(ActivityIntensity = Enums.ActivityIntensity || (Enums.ActivityIntensity = {}));
+        let ActivityEnum;
+        (function (ActivityEnum) {
+            ActivityEnum["Run"] = "Run";
+            ActivityEnum["Walk"] = "Walk";
+            ActivityEnum["Cycling"] = "Cycling";
+            ActivityEnum["Swim"] = "Swim";
+            ActivityEnum["Other"] = "Other";
+        })(ActivityEnum = Enums.ActivityEnum || (Enums.ActivityEnum = {}));
     })(Enums = Activity.Enums || (Activity.Enums = {}));
 })(Activity = exports.Activity || (exports.Activity = {}));
 //# sourceMappingURL=activity.js.map

package/dist/types/activity/activity.js.map

@@ -1 +1 @@
-{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../../types/activity/activity.ts"],"names":[],"mappings":";;;AAAA,IAAiB,QAAQ,CAsCxB;AAtCD,WAAiB,QAAQ;IAwBxB,IAAiB,KAAK,CAarB;IAbD,WAAiB,KAAK;QACrB,IAAY,0BAIX;QAJD,WAAY,0BAA0B;YACrC,mDAAqB,CAAA;YACrB,uDAAyB,CAAA;YACzB,2DAA6B,CAAA;QAC9B,CAAC,EAJW,0BAA0B,GAA1B,gCAA0B,KAA1B,gCAA0B,QAIrC;QAED,IAAY,iBAKX;QALD,WAAY,iBAAiB;YAC5B,oCAAe,CAAA;YACf,0CAAqB,CAAA;YACrB,kCAAa,CAAA;YACb,kCAAa,CAAA;QACd,CAAC,EALW,iBAAiB,GAAjB,uBAAiB,KAAjB,uBAAiB,QAK5B;IACF,CAAC,EAbgB,KAAK,GAAL,cAAK,KAAL,cAAK,QAarB;AACF,CAAC,EAtCgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAsCxB"}
+{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../../types/activity/activity.ts"],"names":[],"mappings":";;;AAAA,IAAiB,QAAQ,CAkDxB;AAlDD,WAAiB,QAAQ;IA6BxB,IAAiB,KAAK,CAoBrB;IApBD,WAAiB,KAAK;QACrB,IAAY,0BAIX;QAJD,WAAY,0BAA0B;YACrC,mDAAqB,CAAA;YACrB,uDAAyB,CAAA;YACzB,2DAA6B,CAAA;QAC9B,CAAC,EAJW,0BAA0B,GAA1B,gCAA0B,KAA1B,gCAA0B,QAIrC;QAED,IAAY,iBAIX;QAJD,WAAY,iBAAiB;YAC5B,oCAAe,CAAA;YACf,0CAAqB,CAAA;YACrB,kCAAa,CAAA;QACd,CAAC,EAJW,iBAAiB,GAAjB,uBAAiB,KAAjB,uBAAiB,QAI5B;QAED,IAAY,YAMX;QAND,WAAY,YAAY;YACvB,2BAAW,CAAA;YACX,6BAAa,CAAA;YACb,mCAAmB,CAAA;YACnB,6BAAa,CAAA;YACb,+BAAe,CAAA;QAChB,CAAC,EANW,YAAY,GAAZ,kBAAY,KAAZ,kBAAY,QAMvB;IACF,CAAC,EApBgB,KAAK,GAAL,cAAK,KAAL,cAAK,QAoBrB;AACF,CAAC,EAlDgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAkDxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedia/types",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "Enums, interfaces, and other common types for use in Hedia's software.",
   "main": "dist/index.js",
   "repository": {
@@ -10,7 +10,8 @@
   "scripts": {
     "tsc": "tsc --build",
     "clean": "tsc --build --clean",
-    "publish-patch": "npm version patch && npx tsc && npm publish"
+    "prepublish": "npm ci --ignore-scripts && npm run tsc",
+    "postpublish": "npm run clean"
   },
   "keywords": [],
   "author": "Hedia",

package/types/activity/activity.ts

@@ -1,14 +1,22 @@
 export namespace Activity {
 	export namespace Types {
+		export type ActivitySettings = ActivityReductionSettings & ActivityTarget;
+		export type ActivityReductionIntervals = ActivityReductionSettings[keyof ActivityReductionSettings];
+
 		type ActivityIntensityKeys = keyof typeof Enums.ActivityIntensity;
 		type ActivityReductionKeys = keyof typeof Enums.ActivityReductionIntervals;
 
-		type ActivityReductionSettings = {
-			//  support for nulling multiple keys, with "hard" | "light" and variants with "fromFortysix" | "fromThirty"
-			[key in ActivityIntensityKeys]: ActivityReductionSettingsIntervals<key, "hard", "fromFortysix">;
+		// prettier-ignore
+		type ActivityReductionSettings = ActivityPostReduction & {
+			[key in ActivityIntensityKeys]: ActivityReductionSettingsIntervals<key, `hard`, `fromFortysix`>;
 		};
 
-		export type ActivitySettings = ActivityReductionSettings & { target: number };
+		type ActivityPostReduction = {
+			post: { [key in ActivityReductionKeys]: number };
+		};
+		type ActivityTarget = {
+			target: number;
+		};
 
 		type ActivityReductionSettingsIntervals<
 			K extends ActivityIntensityKeys,
@@ -17,9 +25,6 @@ export namespace Activity {
 		> = {
 			[key in ActivityReductionKeys]: K extends T ? (key extends U ? null | number : number) : number;
 		};
-
-		type ActivitySettingsOmitTarget = Omit<ActivitySettings, "target">;
-		export type ActivityReductionIntervals = ActivitySettingsOmitTarget[keyof ActivitySettingsOmitTarget];
 	}
 
 	export namespace Enums {
@@ -33,7 +38,14 @@ export namespace Activity {
 			light = `light`,
 			moderate = `moderate`,
 			hard = `hard`,
-			post = `post`,
+		}
+
+		export enum ActivityEnum {
+			Run = `Run`,
+			Walk = `Walk`,
+			Cycling = `Cycling`,
+			Swim = `Swim`,
+			Other = `Other`,
 		}
 	}
 }