@mxpicture/gcp-functions-tools 0.1.69 → 0.1.71

package/dist/{testTemplates → 4testing/templates}/template.medication.js

@@ -19,7 +19,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { MetaArray, MetaCreateTime, MetaDate, MetaInterface, MetaKey, MetaMainInterface, MetaNumber, MetaObject, MetaString, MetaUpdateTime, } from "../meta/meta.decorators.js";
+import { MetaArray, MetaCreateTime, MetaDate, MetaInterface, MetaKey, MetaMainInterface, MetaNumber, MetaObject, MetaString, MetaUpdateTime, } from "../../meta/meta.decorators.js";
 import { MetaPropertyType } from "@mxpicture/gcp-functions-common/meta";
 let MedicationPlanTimesTemplate = class MedicationPlanTimesTemplate {
     morning;

package/dist/{testTemplates → 4testing/templates}/template.settings.js

@@ -19,7 +19,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { MetaBoolean, MetaCreateTime, MetaKey, MetaMainInterface, MetaNumber, MetaString, MetaUpdateTime, } from "../meta/meta.decorators.js";
+import { MetaBoolean, MetaCreateTime, MetaKey, MetaMainInterface, MetaNumber, MetaString, MetaUpdateTime, } from "../../meta/meta.decorators.js";
 let SettingsTemplate = class SettingsTemplate {
     id;
     createTime;

package/dist/4testing/utils.d.ts

@@ -0,0 +1,5 @@
+export declare const testingDir: string;
+export declare const wsRoot: string;
+export declare const templatesDir: string;
+export declare const createTestWorkspace: () => Promise<string>;
+export declare const removeTestWorkspace: (p: string | null) => Promise<void>;

package/dist/4testing/utils.js

@@ -0,0 +1,14 @@
+import { mkdtemp, rm } from "node:fs/promises";
+import { join, resolve } from "node:path";
+export const testingDir = __dirname;
+export const wsRoot = resolve(testingDir, "../..");
+export const templatesDir = resolve(testingDir, "./templates");
+export const createTestWorkspace = async () => mkdtemp(join(testingDir, "generator-test-"));
+export const removeTestWorkspace = async (p) => {
+    if (!p)
+        return;
+    try {
+        return rm(p, { recursive: true });
+    }
+    catch { }
+};

package/dist/generator/GeneratorAnnotations.js

@@ -1,10 +1,11 @@
 import { MetaFileType, MetaFileExtension, MetaTargetType, } from "@mxpicture/gcp-functions-common/meta";
-import { stripAnnotationsHeader, } from "@mxpicture/gcp-functions-common/types";
 import { Collector } from "../common/Collector.js";
 import { formatJson2Spaces } from "../meta/meta.common.js";
+import { mapAnnotationsHeader } from "../meta/meta.main.js";
 import { Generator } from "./Generator.js";
 const typeRegex = /\"type\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
 const itemTypeRegex = /\"itemType\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
+const propertyRefRegex = /\"propertyRef\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
 export class GeneratorAnnotations extends Generator {
     constructor() {
         super(MetaFileType.annotations, MetaFileExtension.ts, MetaTargetType.common, Collector.instance());
@@ -20,36 +21,37 @@ export class GeneratorAnnotations extends Generator {
                 },
                 {
                     path: "@mxpicture/gcp-functions-common/meta",
-                    props: ["MetaPropertyType"],
+                    props: ["MetaPropertyType", "MetaPropertyDataWoType"],
                     isType: false,
                 },
             ],
             name: mainData.templateName,
         };
-        const _header = {
-            ...mainData,
-            routes: Object.entries(mainData.routes).map(([name, params]) => ({
-                ...params,
-                name,
-            })),
-            properties: mainData.properties,
-        };
-        const header = stripAnnotationsHeader(_header);
+        const header = mapAnnotationsHeader(mainData);
         const json = formatJson2Spaces(JSON.stringify(header));
         const lines = json.split("\n");
         res.code.push(`export const ${names.annotations}: AnnotationsHeader = `);
+        // replace enums and types
         for (let line of lines) {
+            // type
             let match = null;
             match = line.match(typeRegex);
             while (match && match.length > 1) {
                 line = line.replace(typeRegex, `type: MetaPropertyType.${match[1]}`);
                 match = line.match(typeRegex);
             }
+            // itemType
             match = line.match(itemTypeRegex);
             while (match && match.length > 1) {
                 line = line.replace(itemTypeRegex, `itemType: MetaPropertyType.${match[1]}`);
                 match = line.match(itemTypeRegex);
             }
+            // propertyRef
+            match = line.match(propertyRefRegex);
+            while (match && match.length > 1) {
+                line = line.replace(propertyRefRegex, `propertyRef: "${match[1]}" as keyof MetaPropertyDataWoType`);
+                match = line.match(propertyRefRegex);
+            }
             res.code.push(line);
         }
         res.code.push(";");

package/dist/generator/GeneratorBackend.js

@@ -22,7 +22,7 @@ export class GeneratorBackend extends Generator {
             imports: [
                 {
                     path: "@mxpicture/gcp-functions-common/types",
-                    props: ["ApiFromRoutes"],
+                    props: ["ApiFromRoutes", "FunctionRequest", "FunctionResponse"],
                     isType: true,
                 },
                 {
@@ -45,6 +45,11 @@ export class GeneratorBackend extends Generator {
                     props: ["FirestoreDataConverter"],
                     isType: true,
                 },
+                {
+                    path: "firebase-functions/v2/https",
+                    props: ["CallableFunction"],
+                    isType: true,
+                },
                 {
                     path: this.importCommon(MetaFileType.routes),
                     props: [names.routes],
@@ -110,7 +115,7 @@ export class GeneratorBackend extends Generator {
     }
     buildCreate(names) {
         return [
-            `export const create${names.basename}Function = (api: I${names.api}) => {`,
+            `export const create${names.basename}Function = (api: I${names.api}): CallableFunction<FunctionRequest<unknown>,Promise<FunctionResponse<unknown>>,unknown> => {`,
             `  const store = new ${names.store}();`,
             "",
             `  const val = new Validation<${names.doc}>("${lowerFirstLetter(names.basename)}");`,

package/dist/meta/meta.main.d.ts

@@ -30,3 +30,6 @@ export interface MetaMainData {
     routes: MetaRoutes;
     additionalImports?: MetaImport[];
 }
+export declare const mapAnnotationsHeader: (data: MetaMainData) => import("@mxpicture/gcp-functions-common/types").AnnotationsHeader;
+export declare const mapAnnotationsRoutes: (routes: MetaRoutes) => import("@mxpicture/gcp-functions-common/types").AnnotationsRoute[];
+export declare const mapAnnotationsProperty: (prop: MetaPropertyData) => import("@mxpicture/gcp-functions-common/types").AnnotationsProperty;

package/dist/meta/meta.main.js

@@ -1,4 +1,5 @@
-import { MetaMainType, } from "@mxpicture/gcp-functions-common/meta";
+import { MetaMainType, MetaPropertyDecorator, } from "@mxpicture/gcp-functions-common/meta";
+import { stripAnnotationsRoute, stripAnnotationsProperty, stripAnnotationsHeader, } from "@mxpicture/gcp-functions-common/types";
 export var MetaMainDecorator;
 (function (MetaMainDecorator) {
     MetaMainDecorator["MetaInterface"] = "MetaInterface";
@@ -8,3 +9,29 @@ export const metaMainOptionsMap = {
     [MetaMainDecorator.MetaInterface]: MetaMainType.interface,
     [MetaMainDecorator.MetaMainInterface]: MetaMainType.mainInterface,
 };
+export const mapAnnotationsHeader = (data) => stripAnnotationsHeader({
+    ...data,
+    routes: mapAnnotationsRoutes(data.routes),
+    properties: data.properties.map(mapAnnotationsProperty),
+});
+export const mapAnnotationsRoutes = (routes) => Object.entries(routes).map(([name, params]) => stripAnnotationsRoute({
+    ...params,
+    name,
+}));
+export const mapAnnotationsProperty = (prop) => {
+    const decorators = Object.values(MetaPropertyDecorator);
+    let propertyRef = null;
+    // find ref/decorator
+    for (const decorator of decorators) {
+        if (decorator in prop && !!prop[decorator]) {
+            propertyRef = decorator;
+            break;
+        }
+    }
+    if (!propertyRef)
+        throw new Error(`No property ref / decorator found in ${prop.propertyKey}`);
+    return stripAnnotationsProperty({
+        ...prop,
+        propertyRef,
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mxpicture/gcp-functions-tools",
-  "version": "0.1.69",
+  "version": "0.1.71",
   "description": "Tools for google cloud functions",
   "type": "module",
   "author": "MXPicture",
@@ -27,13 +27,14 @@
     "clean": "rm -rf dist .tsbuildinfo tsconfig.tsbuildinfo node_modules",
     "lint": "eslint \"src/**/*.{ts,tsx}\" --ext .ts,.tsx",
     "build": "tsc -b .",
-    "test": "vitest run"
+    "test": "vitest run",
+    "test:clean": "rm -rf src/4testing/generator-test-*"
   },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@mxpicture/gcp-functions-common": "workspace:*",
+    "@mxpicture/gcp-functions-common": "^0.1.71",
     "json5": "^1.0.2",
     "micromatch": "^4.0.8",
     "prettier": "^2.8.8",