@mathrunet/masamune 2.2.11 → 2.2.12

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [2.2.12](https://github.com/mathrunet/node_masamune/compare/v2.2.11...v2.2.12) (2024-02-14)
+
+
+### fix
+
+* Bug in not being able to use homebrew functions. ([57f0823](https://github.com/mathrunet/node_masamune/commit/57f0823701bf87f84ce0112361334685aaad62a5))
+
+
+
 ## [2.2.11](https://github.com/mathrunet/node_masamune/compare/v2.2.10...v2.2.11) (2024-02-09)
 
 

package/dist/lib/call_process_function_base.d.ts

@@ -12,11 +12,7 @@ export declare abstract class CallProcessFunctionBase extends FunctionsBase {
      *
      * FunctionsのCallメソッド実行用のFunctionのデータを定義するためのベースクラス。
      */
-    constructor({ id, func, data, options, }: {
-        id: string;
-        func: (region: string[], options: HttpFunctionsOptions, data: {
-            [key: string]: string;
-        }) => Function;
+    constructor({ data, options, }: {
         data?: {
             [key: string]: string;
         };
@@ -40,6 +36,7 @@ export declare abstract class CallProcessFunctionBase extends FunctionsBase {
     abstract process(query: functions.https.CallableRequest<any>): Promise<{
         [key: string]: any;
     }>;
+    abstract id: string;
     data: {
         [key: string]: string;
     };

package/dist/lib/call_process_function_base.js

@@ -46,8 +46,8 @@ class CallProcessFunctionBase extends functions_base_1.FunctionsBase {
      *
      * FunctionsのCallメソッド実行用のFunctionのデータを定義するためのベースクラス。
      */
-    constructor({ id, func, data = {}, options, }) {
-        super({ id: id, func: func, data: data, options: options });
+    constructor({ data = {}, options, }) {
+        super({ data: data, options: options });
         this.data = {};
     }
     build(regions) {

package/dist/lib/call_process_function_base.js.map

@@ -1 +1 @@
-{"version":3,"file":"call_process_function_base.js","sourceRoot":"","sources":["../../src/lib/call_process_function_base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,qDAAuE;AAGvE;;;;GAIG;AACH,MAAsB,uBAAwB,SAAQ,8BAAa;IAC/D;;;;OAIG;IACH,YAAY,EACR,EAAE,EACF,IAAI,EACJ,IAAI,GAAG,EAAE,EACT,OAAO,GAUV;QACG,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAoBhE,SAAI,GAA8B,EAAE,CAAC;IAnBrC,CAAC;IAoBD,KAAK,CAAC,OAAiB;;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAkD,CAAC;QACxE,OAAO,SAAS,CAAC,KAAK,CAAC,MAAM,CACzB;YACI,MAAM,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,OAAO;YAClC,cAAc,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc;YACvC,MAAM,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM;YACvB,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY;YACnC,WAAW,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW;YACjC,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY;SACtC,EACD,CAAO,KAAK,EAAE,EAAE;YACZ,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAA,CACJ,CAAC;IACN,CAAC;CACJ;AA1DD,0DA0DC"}
+{"version":3,"file":"call_process_function_base.js","sourceRoot":"","sources":["../../src/lib/call_process_function_base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,qDAAuE;AAGvE;;;;GAIG;AACH,MAAsB,uBAAwB,SAAQ,8BAAa;IAC/D;;;;OAIG;IACH,YAAY,EACR,IAAI,GAAG,EAAE,EACT,OAAO,GAIV;QACG,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAqB5C,SAAI,GAA8B,EAAE,CAAC;IApBrC,CAAC;IAqBD,KAAK,CAAC,OAAiB;;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAkD,CAAC;QACxE,OAAO,SAAS,CAAC,KAAK,CAAC,MAAM,CACzB;YACI,MAAM,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,OAAO;YAClC,cAAc,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc;YACvC,MAAM,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM;YACvB,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY;YACnC,WAAW,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW;YACjC,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY;SACtC,EACD,CAAO,KAAK,EAAE,EAAE;YACZ,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAA,CACJ,CAAC;IACN,CAAC;CACJ;AAnDD,0DAmDC"}

package/dist/lib/functions_base.d.ts

@@ -19,13 +19,13 @@ export declare abstract class FunctionsBase {
      * `build`にてFirebaseFunctionsを生成するためのコードを記述します。
      */
     constructor({ id, func, data, options, }: {
-        id: string;
-        func: (region: string[], options: FunctionsOptions, data: {
+        id?: string | undefined | null;
+        func?: ((region: string[], options: FunctionsOptions, data: {
             [key: string]: string;
-        }) => Function;
+        }) => Function) | undefined | null;
         data?: {
             [key: string]: string;
-        };
+        } | undefined | null;
         options?: FunctionsOptions | undefined | null;
     });
     /**
@@ -41,9 +41,9 @@ export declare abstract class FunctionsBase {
      *
      * 実際の処理の中身を指定します。
      */
-    readonly func: (region: string[], options: FunctionsOptions, data: {
+    readonly func: ((region: string[], options: FunctionsOptions, data: {
         [key: string]: string;
-    }) => Function;
+    }) => Function) | undefined | null;
     /**
      * Specify the data to be passed to the process.
      *

package/dist/lib/functions_base.js

@@ -21,9 +21,9 @@ class FunctionsBase {
      * `build`にてFirebaseFunctionsを生成するためのコードを記述します。
      */
     constructor({ id, func, data = {}, options, }) {
-        this.id = id;
+        this.id = id !== null && id !== void 0 ? id : "";
         this.func = func;
-        this.data = data;
+        this.data = data !== null && data !== void 0 ? data : {};
         this.options = options !== null && options !== void 0 ? options : {
             timeoutSeconds: 60,
             memory: "256MiB",

package/dist/lib/functions_base.js.map

@@ -1 +1 @@
-{"version":3,"file":"functions_base.js","sourceRoot":"","sources":["../../src/lib/functions_base.ts"],"names":[],"mappings":";;;AAGA;;;;;;;;GAQG;AACH,MAAsB,aAAa;IAC/B;;;;;;;;OAQG;IACH,YAAY,EACR,EAAE,EACF,IAAI,EACJ,IAAI,GAAG,EAAE,EACT,OAAO,GAUV;QACG,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI;YACtB,cAAc,EAAE,EAAE;YAClB,MAAM,EAAE,QAAQ;YAChB,YAAY,EAAE,CAAC;YACf,WAAW,EAAE,EAAE;YACf,YAAY,EAAE,GAAG;SACpB,CAAC;IACN,CAAC;CA0CJ;AA7ED,sCA6EC"}
+{"version":3,"file":"functions_base.js","sourceRoot":"","sources":["../../src/lib/functions_base.ts"],"names":[],"mappings":";;;AAGA;;;;;;;;GAQG;AACH,MAAsB,aAAa;IAC/B;;;;;;;;OAQG;IACH,YAAY,EACR,EAAE,EACF,IAAI,EACJ,IAAI,GAAG,EAAE,EACT,OAAO,GAUV;QACG,IAAI,CAAC,EAAE,GAAG,EAAE,aAAF,EAAE,cAAF,EAAE,GAAI,EAAE,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI;YACtB,cAAc,EAAE,EAAE;YAClB,MAAM,EAAE,QAAQ;YAChB,YAAY,EAAE,CAAC;YACf,WAAW,EAAE,EAAE;YACf,YAAY,EAAE,GAAG;SACpB,CAAC;IACN,CAAC;CA0CJ;AA7ED,sCA6EC"}

package/dist/lib/functions_data.js

@@ -9,6 +9,9 @@ const functions_base_1 = require("./functions_base");
  */
 class FunctionsData extends functions_base_1.FunctionsBase {
     build(region) {
+        if (!this.func) {
+            return () => { };
+        }
         return this.func(region, this.options, this.data);
     }
 }

package/dist/lib/functions_data.js.map

@@ -1 +1 @@
-{"version":3,"file":"functions_data.js","sourceRoot":"","sources":["../../src/lib/functions_data.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AAGjD;;;;GAIG;AACH,MAAa,aAAc,SAAQ,8BAAa;IAC9C,KAAK,CAAC,MAAgB;QACpB,OAAO,IAAI,CAAC,IAAI,CACd,MAAM,EACN,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,IAAI,CACV,CAAC;IACJ,CAAC;CACF;AARD,sCAQC"}
+{"version":3,"file":"functions_data.js","sourceRoot":"","sources":["../../src/lib/functions_data.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AAGjD;;;;GAIG;AACH,MAAa,aAAc,SAAQ,8BAAa;IAC9C,KAAK,CAAC,MAAgB;QACpB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACd,OAAO,GAAG,EAAE,GAAG,CAAC,CAAC;SAClB;QACD,OAAO,IAAI,CAAC,IAAI,CACd,MAAM,EACN,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,IAAI,CACV,CAAC;IACJ,CAAC;CACF;AAXD,sCAWC"}

package/dist/lib/request_process_function_base.d.ts

@@ -14,11 +14,7 @@ export declare abstract class RequestProcessFunctionBase extends FunctionsBase {
      *
      * HTTPリクエスト実行用のFunctionのデータを定義するためのベースクラス。
      */
-    constructor({ id, func, data, options, }: {
-        id: string;
-        func: (region: string[], options: HttpFunctionsOptions, data: {
-            [key: string]: string;
-        }) => Function;
+    constructor({ data, options, }: {
         data?: {
             [key: string]: string;
         };
@@ -40,6 +36,7 @@ export declare abstract class RequestProcessFunctionBase extends FunctionsBase {
      * Functionsに渡されたResponse。
      */
     abstract process(reqest: functions.https.Request, response: express.Response<any>): Promise<void>;
+    abstract id: string;
     data: {
         [key: string]: string;
     };

package/dist/lib/request_process_function_base.js

@@ -46,8 +46,8 @@ class RequestProcessFunctionBase extends functions_base_1.FunctionsBase {
      *
      * HTTPリクエスト実行用のFunctionのデータを定義するためのベースクラス。
      */
-    constructor({ id, func, data = {}, options, }) {
-        super({ id: id, func: func, data: data, options: options });
+    constructor({ data = {}, options, }) {
+        super({ data: data, options: options });
         this.data = {};
     }
     build(regions) {

package/dist/lib/request_process_function_base.js.map

@@ -1 +1 @@
-{"version":3,"file":"request_process_function_base.js","sourceRoot":"","sources":["../../src/lib/request_process_function_base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,qDAAuE;AAKvE;;;;GAIG;AACH,MAAsB,0BAA2B,SAAQ,8BAAa;IAClE;;;;OAIG;IACH,YAAY,EACR,EAAE,EACF,IAAI,EACJ,IAAI,GAAG,EAAE,EACT,OAAO,GAUV;QACG,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAoBhE,SAAI,GAA8B,EAAE,CAAC;IAnBrC,CAAC;IAoBD,KAAK,CAAC,OAAiB;;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAkD,CAAC;QACxE,OAAO,SAAS,CAAC,KAAK,CAAC,SAAS,CAC5B;YACI,MAAM,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,OAAO;YAClC,cAAc,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc;YACvC,MAAM,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM;YACvB,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY;YACnC,WAAW,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW;YACjC,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY;SACtC,EACD,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;YACf,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAClC,CAAC,CAAA,CACJ,CAAC;IACN,CAAC;CACJ;AA1DD,gEA0DC"}
+{"version":3,"file":"request_process_function_base.js","sourceRoot":"","sources":["../../src/lib/request_process_function_base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,qDAAuE;AAKvE;;;;GAIG;AACH,MAAsB,0BAA2B,SAAQ,8BAAa;IAClE;;;;OAIG;IACH,YAAY,EACR,IAAI,GAAG,EAAE,EACT,OAAO,GAIV;QACG,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAqB5C,SAAI,GAA8B,EAAE,CAAC;IApBrC,CAAC;IAqBD,KAAK,CAAC,OAAiB;;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAkD,CAAC;QACxE,OAAO,SAAS,CAAC,KAAK,CAAC,SAAS,CAC5B;YACI,MAAM,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,OAAO;YAClC,cAAc,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc;YACvC,MAAM,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM;YACvB,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY;YACnC,WAAW,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW;YACjC,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY;SACtC,EACD,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;YACf,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAClC,CAAC,CAAA,CACJ,CAAC;IACN,CAAC;CACJ;AAnDD,gEAmDC"}

package/dist/lib/schedule_process_function_base.d.ts

@@ -10,11 +10,7 @@ export declare abstract class ScheduleProcessFunctionBase extends FunctionsBase
      *
      * 定期スケジュール実行用のFunctionのデータを定義するためのベースクラス。
      */
-    constructor({ id, func, data, options, }: {
-        id: string;
-        func: (region: string[], options: SchedulerFunctionsOptions, data: {
-            [key: string]: string;
-        }) => Function;
+    constructor({ data, options, }: {
         data?: {
             [key: string]: string;
         };
@@ -34,6 +30,7 @@ export declare abstract class ScheduleProcessFunctionBase extends FunctionsBase
      * 実際の処理の中身を指定します。
      */
     abstract process(): Promise<void>;
+    abstract id: string;
     data: {
         [key: string]: string;
     };

package/dist/lib/schedule_process_function_base.js

@@ -46,8 +46,8 @@ class ScheduleProcessFunctionBase extends functions_base_1.FunctionsBase {
      *
      * 定期スケジュール実行用のFunctionのデータを定義するためのベースクラス。
      */
-    constructor({ id, func, data = {}, options, }) {
-        super({ id: id, func: func, data: data, options: options });
+    constructor({ data = {}, options, }) {
+        super({ data: data, options: options });
         this.data = {};
     }
     build(regions) {

package/dist/lib/schedule_process_function_base.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedule_process_function_base.js","sourceRoot":"","sources":["../../src/lib/schedule_process_function_base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,qDAA4E;AAE5E;;;;GAIG;AACH,MAAsB,2BAA4B,SAAQ,8BAAa;IACnE;;;;OAIG;IACH,YAAY,EACR,EAAE,EACF,IAAI,EACJ,IAAI,GAAG,EAAE,EACT,OAAO,GAUV;QACG,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAmBhE,SAAI,GAA8B,EAAE,CAAC;IAlBrC,CAAC;IAmBD,KAAK,CAAC,OAAiB;;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAuD,CAAC;QAC7E,OAAO,SAAS,CAAC,SAAS,CAAC,UAAU,CACjC;YACI,QAAQ,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,mCAAI,IAAI,CAAC,QAAQ;YAC5C,MAAM,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,OAAO,CAAC,CAAC,CAAC;YACrC,cAAc,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc;YACvC,MAAM,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM;YACvB,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY;YACnC,WAAW,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW;YACjC,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY;SACtC,EACD,CAAO,KAAK,EAAE,EAAE;YACZ,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QAC1B,CAAC,CAAA,CACJ,CAAC;IACN,CAAC;CACJ;AA1DD,kEA0DC"}
+{"version":3,"file":"schedule_process_function_base.js","sourceRoot":"","sources":["../../src/lib/schedule_process_function_base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,qDAA4E;AAE5E;;;;GAIG;AACH,MAAsB,2BAA4B,SAAQ,8BAAa;IACnE;;;;OAIG;IACH,YAAY,EACR,IAAI,GAAG,EAAE,EACT,OAAO,GAIV;QACG,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAoB5C,SAAI,GAA8B,EAAE,CAAC;IAnBrC,CAAC;IAoBD,KAAK,CAAC,OAAiB;;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAuD,CAAC;QAC7E,OAAO,SAAS,CAAC,SAAS,CAAC,UAAU,CACjC;YACI,QAAQ,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,mCAAI,IAAI,CAAC,QAAQ;YAC5C,MAAM,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,OAAO,CAAC,CAAC,CAAC;YACrC,cAAc,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc;YACvC,MAAM,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM;YACvB,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY;YACnC,WAAW,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW;YACjC,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY;SACtC,EACD,CAAO,KAAK,EAAE,EAAE;YACZ,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QAC1B,CAAC,CAAA,CACJ,CAAC;IACN,CAAC;CACJ;AAnDD,kEAmDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mathrunet/masamune",
-  "version": "2.2.11",
+  "version": "2.2.12",
   "description": "Manages packages for the server portion (NodeJS) of the Masamune framework.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",