@things-factory/shell 6.0.124 → 6.0.125

package/dist-server/utils/get-times-for-period.d.ts

@@ -0,0 +1,8 @@
+export declare function getTimesForPeriod(period: 'today' | 'this month' | '30 days' | 'this year' | '12 months', context: any): Promise<{
+    from: string;
+    to: string;
+}>;
+export declare function getISOStringsForPeriod(period: 'today' | 'this month' | '30 days' | 'this year' | '12 months', context: any): Promise<{
+    from: string;
+    to: string;
+}>;

package/dist-server/utils/get-times-for-period.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getISOStringsForPeriod = exports.getTimesForPeriod = void 0;
+const tslib_1 = require("tslib");
+const moment_timezone_1 = tslib_1.__importDefault(require("moment-timezone"));
+async function getTimesForPeriod(period, context) {
+    const { domain } = context.state;
+    const theDate = moment_timezone_1.default.tz(new Date(), domain.timezone);
+    if (period == 'today') {
+        const from = theDate.clone().format('YYYY-MM-DD');
+        const to = theDate.clone().add(1, 'day').startOf('day').format('YYYY-MM-DD');
+        return { from, to };
+    }
+    else if (period == 'this month') {
+        const from = theDate.clone().startOf('month').format('YYYY-MM-DD');
+        const to = theDate.clone().add(1, 'month').startOf('month').format('YYYY-MM-DD');
+        return { from, to };
+    }
+    else if (period == '30 days') {
+        const from = theDate.clone().subtract(30, 'day').format('YYYY-MM-DD');
+        const to = theDate.clone().add(1, 'day').startOf('day').format('YYYY-MM-DD');
+        return { from, to };
+    }
+    else if (period == 'this year') {
+        const from = theDate.clone().startOf('year').format('YYYY-MM-DD');
+        const to = theDate.clone().add(1, 'year').startOf('year').format('YYYY-MM-DD');
+        return { from, to };
+    }
+    else if (period == '12 months') {
+        const from = theDate.clone().subtract(12, 'month').startOf('month').format('YYYY-MM-DD');
+        const to = theDate.clone().add(1, 'month').startOf('month').format('YYYY-MM-DD');
+        return { from, to };
+    }
+}
+exports.getTimesForPeriod = getTimesForPeriod;
+async function getISOStringsForPeriod(period, context) {
+    const { domain } = context.state;
+    const { from, to } = await getTimesForPeriod(period, context);
+    return {
+        from: moment_timezone_1.default.tz(from, domain.timezone).toISOString(),
+        to: moment_timezone_1.default.tz(to, domain.timezone).toISOString()
+    };
+}
+exports.getISOStringsForPeriod = getISOStringsForPeriod;
+//# sourceMappingURL=get-times-for-period.js.map

package/dist-server/utils/get-times-for-period.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-times-for-period.js","sourceRoot":"","sources":["../../server/utils/get-times-for-period.ts"],"names":[],"mappings":"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","sourcesContent":["import moment from 'moment-timezone'\n\nexport async function getTimesForPeriod(\n  period: 'today' | 'this month' | '30 days' | 'this year' | '12 months',\n  context: any\n): Promise<{ from: string; to: string }> {\n  const { domain } = context.state\n  const theDate = moment.tz(new Date(), domain.timezone)\n\n  if (period == 'today') {\n    const from = theDate.clone().format('YYYY-MM-DD')\n    const to = theDate.clone().add(1, 'day').startOf('day').format('YYYY-MM-DD')\n\n    return { from, to }\n  } else if (period == 'this month') {\n    const from = theDate.clone().startOf('month').format('YYYY-MM-DD')\n    const to = theDate.clone().add(1, 'month').startOf('month').format('YYYY-MM-DD')\n\n    return { from, to }\n  } else if (period == '30 days') {\n    const from = theDate.clone().subtract(30, 'day').format('YYYY-MM-DD')\n    const to = theDate.clone().add(1, 'day').startOf('day').format('YYYY-MM-DD')\n\n    return { from, to }\n  } else if (period == 'this year') {\n    const from = theDate.clone().startOf('year').format('YYYY-MM-DD')\n    const to = theDate.clone().add(1, 'year').startOf('year').format('YYYY-MM-DD')\n\n    return { from, to }\n  } else if (period == '12 months') {\n    const from = theDate.clone().subtract(12, 'month').startOf('month').format('YYYY-MM-DD')\n    const to = theDate.clone().add(1, 'month').startOf('month').format('YYYY-MM-DD')\n\n    return { from, to }\n  }\n}\n\nexport async function getISOStringsForPeriod(\n  period: 'today' | 'this month' | '30 days' | 'this year' | '12 months',\n  context: any\n): Promise<{ from: string; to: string }> {\n  const { domain } = context.state\n  const { from, to } = await getTimesForPeriod(period, context)\n\n  return {\n    from: moment.tz(from, domain.timezone).toISOString(),\n    to: moment.tz(to, domain.timezone).toISOString()\n  }\n}\n"]}

package/dist-server/utils/index.d.ts

@@ -5,3 +5,4 @@ export * from './list-params-converter';
 export * from './publish-progress';
 export * from './get-query-builder-from-list-params';
 export * from './list-param-adjuster';
+export * from './get-times-for-period';

package/dist-server/utils/index.js

@@ -8,4 +8,5 @@ tslib_1.__exportStar(require("./list-params-converter"), exports);
 tslib_1.__exportStar(require("./publish-progress"), exports);
 tslib_1.__exportStar(require("./get-query-builder-from-list-params"), exports);
 tslib_1.__exportStar(require("./list-param-adjuster"), exports);
+tslib_1.__exportStar(require("./get-times-for-period"), exports);
 //# sourceMappingURL=index.js.map

package/dist-server/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/utils/index.ts"],"names":[],"mappings":";;;AAAA,uDAA4B;AAC5B,8DAAmC;AACnC,+DAAoC;AACpC,kEAAuC;AACvC,6DAAkC;AAClC,+EAAoD;AACpD,gEAAqC","sourcesContent":["export * from './get-domain'\nexport * from './condition-builder'\nexport * from './list-query-builder'\nexport * from './list-params-converter'\nexport * from './publish-progress'\nexport * from './get-query-builder-from-list-params'\nexport * from './list-param-adjuster'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/utils/index.ts"],"names":[],"mappings":";;;AAAA,uDAA4B;AAC5B,8DAAmC;AACnC,+DAAoC;AACpC,kEAAuC;AACvC,6DAAkC;AAClC,+EAAoD;AACpD,gEAAqC;AACrC,iEAAsC","sourcesContent":["export * from './get-domain'\nexport * from './condition-builder'\nexport * from './list-query-builder'\nexport * from './list-params-converter'\nexport * from './publish-progress'\nexport * from './get-query-builder-from-list-params'\nexport * from './list-param-adjuster'\nexport * from './get-times-for-period'\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "6.0.124",
+  "version": "6.0.125",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -97,6 +97,7 @@
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "mkdirp": "^1.0.4",
+    "moment-timezone": "^0.5.43",
     "mqtt": "^4.3.4",
     "node-fetch": "^2.6.0",
     "nodemon": "^2.0.19",
@@ -129,5 +130,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "6841e3180fd0fb4ef7ee81c2a153cda80300e904"
+  "gitHead": "2d741c0c6ad8cf572560ac5bcc6fb7de470ede72"
 }

package/server/utils/get-times-for-period.ts

@@ -0,0 +1,49 @@
+import moment from 'moment-timezone'
+
+export async function getTimesForPeriod(
+  period: 'today' | 'this month' | '30 days' | 'this year' | '12 months',
+  context: any
+): Promise<{ from: string; to: string }> {
+  const { domain } = context.state
+  const theDate = moment.tz(new Date(), domain.timezone)
+
+  if (period == 'today') {
+    const from = theDate.clone().format('YYYY-MM-DD')
+    const to = theDate.clone().add(1, 'day').startOf('day').format('YYYY-MM-DD')
+
+    return { from, to }
+  } else if (period == 'this month') {
+    const from = theDate.clone().startOf('month').format('YYYY-MM-DD')
+    const to = theDate.clone().add(1, 'month').startOf('month').format('YYYY-MM-DD')
+
+    return { from, to }
+  } else if (period == '30 days') {
+    const from = theDate.clone().subtract(30, 'day').format('YYYY-MM-DD')
+    const to = theDate.clone().add(1, 'day').startOf('day').format('YYYY-MM-DD')
+
+    return { from, to }
+  } else if (period == 'this year') {
+    const from = theDate.clone().startOf('year').format('YYYY-MM-DD')
+    const to = theDate.clone().add(1, 'year').startOf('year').format('YYYY-MM-DD')
+
+    return { from, to }
+  } else if (period == '12 months') {
+    const from = theDate.clone().subtract(12, 'month').startOf('month').format('YYYY-MM-DD')
+    const to = theDate.clone().add(1, 'month').startOf('month').format('YYYY-MM-DD')
+
+    return { from, to }
+  }
+}
+
+export async function getISOStringsForPeriod(
+  period: 'today' | 'this month' | '30 days' | 'this year' | '12 months',
+  context: any
+): Promise<{ from: string; to: string }> {
+  const { domain } = context.state
+  const { from, to } = await getTimesForPeriod(period, context)
+
+  return {
+    from: moment.tz(from, domain.timezone).toISOString(),
+    to: moment.tz(to, domain.timezone).toISOString()
+  }
+}

package/server/utils/index.ts

@@ -5,3 +5,4 @@ export * from './list-params-converter'
 export * from './publish-progress'
 export * from './get-query-builder-from-list-params'
 export * from './list-param-adjuster'
+export * from './get-times-for-period'