@things-factory/shell 8.0.55 → 8.0.63

package/dist-server/typeorm/cron-month-transform.d.ts

@@ -0,0 +1,5 @@
+import { ValueTransformer } from 'typeorm';
+/**
+ * DB 저장/로드 시 월 숫자만 0-기반↔1-기반으로 상호 변환하는 트랜스포머
+ */
+export declare const cronMonthZeroBasedTransformer: ValueTransformer;

package/dist-server/typeorm/cron-month-transform.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cronMonthZeroBasedTransformer = void 0;
+/**
+ * 크론 표현식의 월 필드(5필드=분-시-일-월-요일 / 6필드=초-분-시-일-월-요일)만 숫자일 때 ±1 시프트한다.
+ * - 리스트(1,3,12), 범위(3-5), 스텝(3/2, 3-9/2)에서 숫자에 한해 변환
+ * - 영문(JAN-DEC), '*', '?' 등은 그대로 둔다.
+ */
+function shiftMonthNumbersInCronExpression(expression, delta) {
+    if (!expression)
+        return expression;
+    const parts = expression.trim().split(/\s+/);
+    if (parts.length !== 5 && parts.length !== 6)
+        return expression;
+    const monthIndex = parts.length === 6 ? 4 : 3;
+    const monthToken = parts[monthIndex];
+    const isNumeric = (s) => /^\d+$/.test(s);
+    const isAlpha = (s) => /^[A-Za-z]+$/.test(s);
+    const passthrough = (s) => s === '*' || s === '?';
+    const shiftNum = (nStr) => (isNumeric(nStr) ? String(parseInt(nStr, 10) + delta) : nStr);
+    const shiftPrimary = (primary) => {
+        const p = primary.trim();
+        if (p.includes('-')) {
+            const [a, b] = p.split('-');
+            return `${shiftNum(a.trim())}-${shiftNum(b.trim())}`;
+        }
+        return shiftNum(p);
+    };
+    const shiftedMonth = monthToken
+        .split(',')
+        .map(seg => {
+        const part = seg.trim();
+        if (!part)
+            return part;
+        if (passthrough(part) || isAlpha(part))
+            return part;
+        const [primary, step] = part.split('/');
+        const shifted = shiftPrimary(primary);
+        return step ? `${shifted}/${step}` : shifted;
+    })
+        .join(',');
+    parts[monthIndex] = shiftedMonth;
+    return parts.join(' ');
+}
+/**
+ * DB 저장/로드 시 월 숫자만 0-기반↔1-기반으로 상호 변환하는 트랜스포머
+ */
+exports.cronMonthZeroBasedTransformer = {
+    to(value) {
+        if (value == null)
+            return value;
+        return shiftMonthNumbersInCronExpression(value, -1);
+    },
+    from(value) {
+        if (value == null)
+            return value;
+        return shiftMonthNumbersInCronExpression(value, +1);
+    }
+};
+//# sourceMappingURL=cron-month-transform.js.map

package/dist-server/typeorm/cron-month-transform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cron-month-transform.js","sourceRoot":"","sources":["../../server/typeorm/cron-month-transform.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,SAAS,iCAAiC,CAAC,UAAkB,EAAE,KAAa;IAC1E,IAAI,CAAC,UAAU;QAAE,OAAO,UAAU,CAAA;IAClC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC5C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,UAAU,CAAA;IAC/D,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC7C,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,CAAA;IAEpC,MAAM,SAAS,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAChD,MAAM,OAAO,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACpD,MAAM,WAAW,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,CAAA;IAEzD,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAEhG,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,EAAE;QACvC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;QACxB,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC3B,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,CAAA;QACtD,CAAC;QACD,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAA;IACpB,CAAC,CAAA;IAED,MAAM,YAAY,GAAG,UAAU;SAC5B,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,GAAG,CAAC,EAAE;QACT,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,CAAA;QACvB,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAA;QACtB,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAA;QACnD,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACvC,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;QACrC,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAA;IAC9C,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAA;IAEZ,KAAK,CAAC,UAAU,CAAC,GAAG,YAAY,CAAA;IAChC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACxB,CAAC;AAED;;GAEG;AACU,QAAA,6BAA6B,GAAqB;IAC7D,EAAE,CAAC,KAAgC;QACjC,IAAI,KAAK,IAAI,IAAI;YAAE,OAAO,KAAY,CAAA;QACtC,OAAO,iCAAiC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IACrD,CAAC;IACD,IAAI,CAAC,KAAgC;QACnC,IAAI,KAAK,IAAI,IAAI;YAAE,OAAO,KAAY,CAAA;QACtC,OAAO,iCAAiC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IACrD,CAAC;CACF,CAAA","sourcesContent":["import { ValueTransformer } from 'typeorm'\n\n/**\n * 크론 표현식의 월 필드(5필드=분-시-일-월-요일 / 6필드=초-분-시-일-월-요일)만 숫자일 때 ±1 시프트한다.\n * - 리스트(1,3,12), 범위(3-5), 스텝(3/2, 3-9/2)에서 숫자에 한해 변환\n * - 영문(JAN-DEC), '*', '?' 등은 그대로 둔다.\n */\nfunction shiftMonthNumbersInCronExpression(expression: string, delta: number): string {\n  if (!expression) return expression\n  const parts = expression.trim().split(/\\s+/)\n  if (parts.length !== 5 && parts.length !== 6) return expression\n  const monthIndex = parts.length === 6 ? 4 : 3\n  const monthToken = parts[monthIndex]\n\n  const isNumeric = (s: string) => /^\\d+$/.test(s)\n  const isAlpha = (s: string) => /^[A-Za-z]+$/.test(s)\n  const passthrough = (s: string) => s === '*' || s === '?'\n\n  const shiftNum = (nStr: string) => (isNumeric(nStr) ? String(parseInt(nStr, 10) + delta) : nStr)\n\n  const shiftPrimary = (primary: string) => {\n    const p = primary.trim()\n    if (p.includes('-')) {\n      const [a, b] = p.split('-')\n      return `${shiftNum(a.trim())}-${shiftNum(b.trim())}`\n    }\n    return shiftNum(p)\n  }\n\n  const shiftedMonth = monthToken\n    .split(',')\n    .map(seg => {\n      const part = seg.trim()\n      if (!part) return part\n      if (passthrough(part) || isAlpha(part)) return part\n      const [primary, step] = part.split('/')\n      const shifted = shiftPrimary(primary)\n      return step ? `${shifted}/${step}` : shifted\n    })\n    .join(',')\n\n  parts[monthIndex] = shiftedMonth\n  return parts.join(' ')\n}\n\n/**\n * DB 저장/로드 시 월 숫자만 0-기반↔1-기반으로 상호 변환하는 트랜스포머\n */\nexport const cronMonthZeroBasedTransformer: ValueTransformer = {\n  to(value: string | null | undefined) {\n    if (value == null) return value as any\n    return shiftMonthNumbersInCronExpression(value, -1)\n  },\n  from(value: string | null | undefined) {\n    if (value == null) return value as any\n    return shiftMonthNumbersInCronExpression(value, +1)\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "8.0.55",
+  "version": "8.0.63",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -134,5 +134,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "172e2730c2e249faa839070c1b21d81bb4b6c946"
+  "gitHead": "24ba37efe2e871175a9e4fd816d02d9807491b91"
 }

package/server/index.ts

@@ -11,3 +11,4 @@ export * from './service'
 export * from './typeorm/encrypt-transform'
 export * from './typeorm/json5-transform'
 export * from './typeorm/round-transform'
+export * from './typeorm/cron-month-transform.js'

package/server/server-dev.ts

@@ -139,7 +139,7 @@ const bootstrap = async () => {
   })
 
   var subscriptionMiddleware = []
-  process.emit('bootstrap-module-subscription' as any, app, subscriptionMiddleware)
+  process.emit('bootstrap-module-subscription' as any, app, subscriptionMiddleware as any)
 
   const builtSchema = await schema()
 
@@ -253,7 +253,7 @@ const bootstrap = async () => {
 
   /* routers */
   const ssoMiddlewares = []
-  process.emit('bootstrap-collect-sso-middleware' as any, null, ssoMiddlewares)
+  process.emit('bootstrap-collect-sso-middleware' as any, null, ssoMiddlewares as any)
   app.ssoMiddlewares = ssoMiddlewares
 
   process.emit('bootstrap-module-global-public-route' as any, app, globalPublicRouter)

package/server/server.ts

@@ -115,7 +115,7 @@ const bootstrap = async () => {
   })
 
   var subscriptionMiddleware = []
-  process.emit('bootstrap-module-subscription' as any, app, subscriptionMiddleware)
+  process.emit('bootstrap-module-subscription' as any, app, subscriptionMiddleware as any)
 
   const builtSchema = await schema()
 
@@ -223,7 +223,7 @@ const bootstrap = async () => {
 
   /* routers */
   const ssoMiddlewares = []
-  process.emit('bootstrap-collect-sso-middleware' as any, null, ssoMiddlewares)
+  process.emit('bootstrap-collect-sso-middleware' as any, null, ssoMiddlewares as any)
   app.ssoMiddlewares = ssoMiddlewares
 
   process.emit('bootstrap-module-global-public-route' as any, app, globalPublicRouter)

package/server/typeorm/cron-month-transform.ts

@@ -0,0 +1,58 @@
+import { ValueTransformer } from 'typeorm'
+
+/**
+ * 크론 표현식의 월 필드(5필드=분-시-일-월-요일 / 6필드=초-분-시-일-월-요일)만 숫자일 때 ±1 시프트한다.
+ * - 리스트(1,3,12), 범위(3-5), 스텝(3/2, 3-9/2)에서 숫자에 한해 변환
+ * - 영문(JAN-DEC), '*', '?' 등은 그대로 둔다.
+ */
+function shiftMonthNumbersInCronExpression(expression: string, delta: number): string {
+  if (!expression) return expression
+  const parts = expression.trim().split(/\s+/)
+  if (parts.length !== 5 && parts.length !== 6) return expression
+  const monthIndex = parts.length === 6 ? 4 : 3
+  const monthToken = parts[monthIndex]
+
+  const isNumeric = (s: string) => /^\d+$/.test(s)
+  const isAlpha = (s: string) => /^[A-Za-z]+$/.test(s)
+  const passthrough = (s: string) => s === '*' || s === '?'
+
+  const shiftNum = (nStr: string) => (isNumeric(nStr) ? String(parseInt(nStr, 10) + delta) : nStr)
+
+  const shiftPrimary = (primary: string) => {
+    const p = primary.trim()
+    if (p.includes('-')) {
+      const [a, b] = p.split('-')
+      return `${shiftNum(a.trim())}-${shiftNum(b.trim())}`
+    }
+    return shiftNum(p)
+  }
+
+  const shiftedMonth = monthToken
+    .split(',')
+    .map(seg => {
+      const part = seg.trim()
+      if (!part) return part
+      if (passthrough(part) || isAlpha(part)) return part
+      const [primary, step] = part.split('/')
+      const shifted = shiftPrimary(primary)
+      return step ? `${shifted}/${step}` : shifted
+    })
+    .join(',')
+
+  parts[monthIndex] = shiftedMonth
+  return parts.join(' ')
+}
+
+/**
+ * DB 저장/로드 시 월 숫자만 0-기반↔1-기반으로 상호 변환하는 트랜스포머
+ */
+export const cronMonthZeroBasedTransformer: ValueTransformer = {
+  to(value: string | null | undefined) {
+    if (value == null) return value as any
+    return shiftMonthNumbersInCronExpression(value, -1)
+  },
+  from(value: string | null | undefined) {
+    if (value == null) return value as any
+    return shiftMonthNumbersInCronExpression(value, +1)
+  }
+}