ts-glitter 16.2.4 → 16.2.8

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.
Files changed (27) hide show
  1. package/lowcode/Entry.js +1 -1
  2. package/lowcode/Entry.ts +1 -1
  3. package/lowcode/glitter-base/global/currency.d.ts +19 -0
  4. package/lowcode/glitter-base/global/currency.js.map +1 -0
  5. package/lowcode/glitter-base/global/global-user.d.ts +5 -0
  6. package/lowcode/glitter-base/global/global-user.js.map +1 -1
  7. package/lowcode/glitter-base/global/language.d.ts +22 -0
  8. package/lowcode/glitter-base/global/language.js.map +1 -0
  9. package/lowcode/glitter-base/route/shopping.d.ts +28 -2
  10. package/lowcode/glitter-base/route/shopping.js.map +1 -1
  11. package/lowcode/glitterBundle/api/base.js.map +1 -1
  12. package/package.json +5 -2
  13. package/src/api-public/services/shopping.d.ts +1 -1
  14. package/src/api-public/services/shopping.js +1 -0
  15. package/src/api-public/services/shopping.js.map +1 -1
  16. package/src/api-public/services/shopping.ts +1 -0
  17. package/src/helper/glitter-util.d.ts +4 -2
  18. package/src/helper/glitter-util.js +20 -11
  19. package/src/helper/glitter-util.js.map +1 -1
  20. package/src/helper/glitter-util.ts +22 -12
  21. package/src/index.js +255 -433
  22. package/src/index.js.map +1 -1
  23. package/src/index.ts +246 -441
  24. package/src/seo-config.d.ts +40 -0
  25. package/src/seo-config.js +303 -0
  26. package/src/seo-config.js.map +1 -0
  27. package/src/seo-config.ts +357 -0
package/src/api-public/services/shopping.ts CHANGED
@@ -245,6 +245,7 @@ export class Shopping {
245
245
  language?: string;
246
246
  currency_code?: string;
247
247
  }) {
248
+ console.log(`query=>`, query);
248
249
  try {
249
250
  query.language = query.language ?? (await App.getDefLanguage(this.app));
250
251
  query.show_hidden = query.show_hidden ?? 'true';
package/src/helper/glitter-util.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- /// <reference types="cookie-parser" />
2
1
  import * as core from "express-serve-static-core";
3
2
  import express from 'express';
4
3
  export declare class GlitterUtil {
@@ -12,7 +11,10 @@ export declare class GlitterUtil {
12
11
  rout: string;
13
12
  path: string;
14
13
  root_path: string;
15
- seoManager: (req: express.Request, resp: express.Response) => Promise<string>;
14
+ seoManager: (req: express.Request, resp: express.Response) => Promise<{
15
+ head: string;
16
+ body: string;
17
+ }>;
16
18
  sitemap: (req: express.Request, resp: express.Response) => Promise<string>;
17
19
  sitemap_list: (req: express.Request, resp: express.Response) => Promise<string>;
18
20
  robots: (req: express.Request, resp: express.Response) => Promise<string>;
package/src/helper/glitter-util.js CHANGED
@@ -61,17 +61,26 @@ class GlitterUtil {
61
61
  let fullPath = dd.path + "/index.html";
62
62
  const data = fs_1.default.readFileSync(fullPath, 'utf8');
63
63
  resp.header('Content-Type', 'text/html; charset=UTF-8');
64
- return resp.send(data.replace(data.substring(data.indexOf(`<head>`), data.indexOf(`</head>`) + 7), `
65
- <meta name="apple-mobile-web-app-capable" content="yes">
66
- <meta name="apple-touch-fullscreen" content="yes">
67
- <meta http-equiv="content-type" content="text/html;charset=UTF-8">
68
- ${(req.query._preview_width && req.query._preview_scale) ? `
69
- <meta name="viewport" content="width=${req.query._preview_width}, initial-scale=${req.query._preview_scale}, maximum-scale=${req.query._preview_scale}, user-scalable=no">
70
- ` : `
71
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, shrink-to-fit=no">
72
- `}
73
- ${(req.body) ? `<script>window.post_body=${(typeof req.body === 'string') ? req.body : `${JSON.stringify(req.body)}`};</script>` : ``}
74
- ` + seo));
64
+ let meta_info = [
65
+ `<head>`,
66
+ `<meta name="apple-mobile-web-app-capable" content="yes">`,
67
+ `<meta name="apple-touch-fullscreen" content="yes">`,
68
+ `<meta http-equiv="content-type" content="text/html;charset=UTF-8">`,
69
+ (req.query._preview_width && req.query._preview_scale) ? `<meta name="viewport" content="width=${req.query._preview_width}, initial-scale=${req.query._preview_scale}, maximum-scale=${req.query._preview_scale}, user-scalable=no">` : `<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, shrink-to-fit=no">`,
70
+ seo.head,
71
+ (req.body) ? `<script>window.post_body=${(typeof req.body === 'string') ? req.body : `${JSON.stringify(req.body)}`};</script>` : ``,
72
+ `</head>`,
73
+ seo.body,
74
+ ].map((dd) => {
75
+ return dd.trim();
76
+ });
77
+ try {
78
+ return resp.send(data.replace(data.substring(data.indexOf(`<head>`), data.indexOf(`</head>`) + 7), meta_info.join('\n')));
79
+ }
80
+ catch (e) {
81
+ console.log(e);
82
+ return e;
83
+ }
75
84
  }
76
85
  else {
77
86
  return resp.sendFile(decodeURI(fileURL));
package/src/helper/glitter-util.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"glitter-util.js","sourceRoot":"","sources":["glitter-util.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"glitter-util.js","sourceRoot":"","sources":["glitter-util.ts"],"names":[],"mappings":"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"}
package/src/helper/glitter-util.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import * as core from "express-serve-static-core";
2
2
  import fs from "fs";
3
3
  import express from 'express';
4
+ import prettier from "prettier";
4
5
 
5
6
  export class GlitterUtil {
6
7
  public static async set_frontend(express: core.Express, rout: { rout: string, path: string, seoManager: (req: express.Request, resp: express.Response) => Promise<string> }[]) {
@@ -23,7 +24,7 @@ export class GlitterUtil {
23
24
  }
24
25
  }
25
26
 
26
- public static async set_frontend_v2(express: core.Express, rout: { app_name: string, rout: string, path: string, root_path: string, seoManager: (req: express.Request, resp: express.Response) => Promise<string>, sitemap: (req: express.Request, resp: express.Response) => Promise<string> ,
27
+ public static async set_frontend_v2(express: core.Express, rout: { app_name: string, rout: string, path: string, root_path: string, seoManager: (req: express.Request, resp: express.Response) => Promise<{head:string,body:string}>, sitemap: (req: express.Request, resp: express.Response) => Promise<string> ,
27
28
  sitemap_list: (req: express.Request, resp: express.Response) => Promise<string>
28
29
  robots:(req: express.Request, resp: express.Response) => Promise<string>,
29
30
  tw_shop:(req: express.Request, resp: express.Response) => Promise<string>
@@ -59,17 +60,26 @@ export class GlitterUtil {
59
60
  let fullPath = dd.path + "/index.html"
60
61
  const data = fs.readFileSync(fullPath, 'utf8');
61
62
  resp.header('Content-Type', 'text/html; charset=UTF-8')
62
- return resp.send(data.replace(data.substring(data.indexOf(`<head>`), data.indexOf(`</head>`) + 7), `
63
- <meta name="apple-mobile-web-app-capable" content="yes">
64
- <meta name="apple-touch-fullscreen" content="yes">
65
- <meta http-equiv="content-type" content="text/html;charset=UTF-8">
66
- ${(req.query._preview_width && req.query._preview_scale) ? `
67
- <meta name="viewport" content="width=${req.query._preview_width}, initial-scale=${req.query._preview_scale}, maximum-scale=${req.query._preview_scale}, user-scalable=no">
68
- `:`
69
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, shrink-to-fit=no">
70
- `}
71
- ${(req.body) ? `<script>window.post_body=${(typeof req.body==='string') ? req.body:`${JSON.stringify(req.body)}`};</script>`:``}
72
- `+seo))
63
+ // 格式化 HTML
64
+ let meta_info:string[]=[
65
+ `<head>`,
66
+ `<meta name="apple-mobile-web-app-capable" content="yes">`,
67
+ `<meta name="apple-touch-fullscreen" content="yes">`,
68
+ `<meta http-equiv="content-type" content="text/html;charset=UTF-8">`,
69
+ (req.query._preview_width && req.query._preview_scale) ? `<meta name="viewport" content="width=${req.query._preview_width}, initial-scale=${req.query._preview_scale}, maximum-scale=${req.query._preview_scale}, user-scalable=no">`:`<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, shrink-to-fit=no">`,
70
+ seo.head,
71
+ (req.body) ? `<script>window.post_body=${(typeof req.body==='string') ? req.body:`${JSON.stringify(req.body)}`};</script>`:``,
72
+ `</head>`,
73
+ seo.body,
74
+ ].map((dd)=>{
75
+ return dd.trim()
76
+ });
77
+ try {
78
+ return resp.send(data.replace(data.substring(data.indexOf(`<head>`), data.indexOf(`</head>`) + 7), meta_info.join('\n')))
79
+ }catch (e) {
80
+ console.log(e)
81
+ return e
82
+ }
73
83
  } else {
74
84
  return resp.sendFile(decodeURI(fileURL))
75
85
  }