@mxpicture/gcp-functions-generator 1.3.43 → 1.3.45

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,6 @@
1
1
  import { Generator } from "./Generator.js";
2
2
  import type { GeneratorEnv, GeneratorRunItem, GeneratorRunResult } from "../common/types.common.js";
3
+ import type { AnnotationsHeader } from "@mxpicture/gcp-functions-common/types";
3
4
  /**
4
5
  * Generator that produces annotation metadata and initial-value factory functions.
5
6
  *
@@ -9,6 +10,7 @@ import type { GeneratorEnv, GeneratorRunItem, GeneratorRunResult } from "../comm
9
10
  */
10
11
  export declare class GeneratorAnnotations extends Generator {
11
12
  constructor();
13
+ protected sort(header: AnnotationsHeader): void;
12
14
  protected runHeader(item: GeneratorRunItem, env: GeneratorEnv): Promise<GeneratorRunResult | null>;
13
15
  }
14
16
  declare const _default: GeneratorAnnotations;
@@ -1 +1 @@
1
- {"version":3,"file":"GeneratorAnnotations.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorAnnotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAO3C,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AAWnC;;;;;;GAMG;AACH,qBAAa,oBAAqB,SAAQ,SAAS;;cASxB,SAAS,CAChC,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;CAsFtC;;AAED,wBAA0C"}
1
+ {"version":3,"file":"GeneratorAnnotations.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorAnnotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAQ3C,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EACV,iBAAiB,EAElB,MAAM,uCAAuC,CAAC;AAW/C;;;;;;GAMG;AACH,qBAAa,oBAAqB,SAAQ,SAAS;;IASjD,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI;cAoBtB,SAAS,CAChC,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;CAwFtC;;AAED,wBAA0C"}
@@ -1,6 +1,6 @@
1
1
  import { Generator } from "./Generator.js";
2
2
  import { formatJsonStringify } from "@mxpicture/build-api/code";
3
- import { DecoFileExtension, DecoFileType, DecoPackageType, } from "@mxpicture/gcp-functions-common/decorator";
3
+ import { castDecoEnum, DecoFileExtension, DecoFileType, DecoPackageType, } from "@mxpicture/gcp-functions-common/decorator";
4
4
  const typeRegex = /\"type\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
5
5
  const itemTypeRegex = /\"itemType\": \"(DecoPropertyType\.|)([a-zA-Z][a-zA-Z0-9]*)\"/;
6
6
  const propertyRefRegex = /\"propertyRef\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
@@ -22,11 +22,27 @@ export class GeneratorAnnotations extends Generator {
22
22
  packageType: DecoPackageType.common,
23
23
  });
24
24
  }
25
+ sort(header) {
26
+ header.properties.sort((a, b) => a.propertyKey.localeCompare(b.propertyKey));
27
+ header.routes?.sort((a, b) => a.name.localeCompare(b.name));
28
+ for (const prop of header.properties) {
29
+ const enumData = castDecoEnum(prop.data);
30
+ if (!enumData)
31
+ continue;
32
+ enumData.keys = Object.keys(enumData.keys)
33
+ .sort()
34
+ .reduce((acc, key) => {
35
+ acc[key] = enumData.keys[key];
36
+ return acc;
37
+ }, {});
38
+ }
39
+ }
25
40
  async runHeader(item, env) {
26
41
  void env;
27
42
  const names = item.names;
28
43
  const code = [];
29
44
  const header = item.decorator.extractAnnotations();
45
+ this.sort(header);
30
46
  const json = await formatJsonStringify(JSON.stringify(header));
31
47
  const lines = json.split("\n");
32
48
  code.push("", `export const ${names.initialFunc} = (): Partial<${names.doc}> => annoDocInitial(${names.annotations}.properties);`, "");
@@ -1 +1 @@
1
- {"version":3,"file":"GeneratorAnnotations.js","sourceRoot":"","sources":["../../src/generator/GeneratorAnnotations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GeneratorAnnotations.js","sourceRoot":"","sources":["../../src/generator/GeneratorAnnotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,eAAe,GAChB,MAAM,2CAA2C,CAAC;AAWnD,MAAM,SAAS,GAAG,sCAAsC,CAAC;AACzD,MAAM,aAAa,GACjB,+DAA+D,CAAC;AAClE,MAAM,gBAAgB,GAAG,6CAA6C,CAAC;AACvE,MAAM,kBAAkB,GAAG,+CAA+C,CAAC;AAC3E,MAAM,eAAe,GAAG,4CAA4C,CAAC;AACrE,MAAM,qBAAqB,GACzB,mDAAmD,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,OAAO,oBAAqB,SAAQ,SAAS;IACjD;QACE,KAAK,CAAC;YACJ,QAAQ,EAAE,YAAY,CAAC,WAAW;YAClC,GAAG,EAAE,iBAAiB,CAAC,EAAE;YACzB,WAAW,EAAE,eAAe,CAAC,MAAM;SACpC,CAAC,CAAC;IACL,CAAC;IAES,IAAI,CAAC,MAAyB;QACtC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC9B,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAC3C,CAAC;QAEF,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAE5D,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACrC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,CAAC,QAAQ;gBAAE,SAAS;YAExB,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;iBACvC,IAAI,EAAE;iBACN,MAAM,CAAC,CAAC,GAAqB,EAAE,GAAG,EAAE,EAAE;gBACrC,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC9B,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,CAAC;IACH,CAAC;IAEkB,KAAK,CAAC,SAAS,CAChC,IAAsB,EACtB,GAAiB;QAEjB,KAAK,GAAG,CAAC;QACT,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,MAAM,IAAI,GAAa,EAAE,CAAC;QAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,CAAC;QACnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAElB,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,CAAC,IAAI,CACP,EAAE,EACF,gBAAgB,KAAK,CAAC,WAAW,kBAAkB,KAAK,CAAC,GAAG,uBAAuB,KAAK,CAAC,WAAW,eAAe,EACnH,EAAE,CACH,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,gBAAgB,KAAK,CAAC,WAAW,wBAAwB,CAAC,CAAC;QAErE,0BAA0B;QAC1B,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,OAAO;YACP,IAAI,KAAK,GAA4B,IAAI,CAAC;YAC1C,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC9B,OAAO,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,0BAA0B,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACrE,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAChC,CAAC;YAED,WAAW;YACX,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAClC,OAAO,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjC,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,aAAa,EACb,8BAA8B,KAAK,CAAC,CAAC,CAAC,EAAE,CACzC,CAAC;gBACF,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACpC,CAAC;YAED,cAAc;YACd,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACrC,OAAO,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjC,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,gBAAgB,EAChB,iBAAiB,KAAK,CAAC,CAAC,CAAC,mCAAmC,CAC7D,CAAC;gBACF,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACvC,CAAC;YAED,aAAa;YACb,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACpC,OAAO,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjC,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,eAAe,EACf,8BAA8B,KAAK,CAAC,CAAC,CAAC,EAAE,CACzC,CAAC;gBACF,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACtC,CAAC;YAED,mBAAmB;YACnB,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YAC1C,OAAO,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjC,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,qBAAqB,EACrB,+BAA+B,KAAK,CAAC,CAAC,CAAC,EAAE,CAC1C,CAAC;gBACF,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YAC5C,CAAC;YAED,kBAAkB;YAClB,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACvC,OAAO,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,cAAc,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAClE,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACzC,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEf,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;YACzB,IAAI;YACJ,aAAa,EAAE,EAAE;YACjB,iBAAiB,EAAE,EAAE;SACtB,CAAC;IACJ,CAAC;CACF;AAED,eAAe,IAAI,oBAAoB,EAAE,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mxpicture/gcp-functions-generator",
3
- "version": "1.3.43",
3
+ "version": "1.3.45",
4
4
  "description": "Tools for google cloud functions",
5
5
  "type": "module",
6
6
  "author": "MXPicture",
@@ -49,9 +49,9 @@
49
49
  "dependencies": {
50
50
  "@google-cloud/scheduler": "^5.3.1",
51
51
  "@mxpicture/build-api": "^0.4.37",
52
- "@mxpicture/gcp-functions-backend": "^1.3.43",
53
- "@mxpicture/gcp-functions-common": "^1.3.43",
54
- "@mxpicture/gcp-functions-frontend": "^1.3.43",
52
+ "@mxpicture/gcp-functions-backend": "^1.3.45",
53
+ "@mxpicture/gcp-functions-common": "^1.3.45",
54
+ "@mxpicture/gcp-functions-frontend": "^1.3.45",
55
55
  "google-auth-library": "^10.6.2",
56
56
  "googleapis": "^171.4.0",
57
57
  "json5": "^2.2.3"