@heycar/heycars-map 0.9.6 → 0.9.8-fix1

package/README.md

@@ -22,6 +22,19 @@ npm install @heycar/heycars-map --save
 import "@heycar/heycars-map/dist/style.css";
 ```
 
+### 自定义字体
+
+目前地图提供了 3 个字体 css variables 用于外部制定特殊字体
+
+```css
+/* 使用特殊字体 HarmonyOS_Sans_SC_Regular */
+body {
+  --HEYCAR_MAP_CSS_VAR_FONT_REGULAR: HarmonyOS_Sans_SC_Regular, "PingFangSC-Regular", "PingFang SC";
+  --HEYCAR_MAP_CSS_VAR_FONT_MEDIUM: HarmonyOS_Sans_SC_Medium, "PingFangSC-Medium", "PingFang SC";
+  --HEYCAR_MAP_CSS_VAR_FONT_SEMI_BOLD: HarmonyOS_Sans_SC_Bold, "PingFangSC-Semibold", "PingFang SC";
+}
+```
+
 ### 使用
 
 常用数据结构
@@ -202,7 +215,7 @@ export default defineComponent({
             " 最终的地址是: ",
             place,
             " 是否在绿区内: ",
-            isInZone
+            isInZone,
           );
         }}
         onClickLocator={() =>
@@ -313,7 +326,7 @@ export default defineComponent({
             " 最终的地址是: ",
             place,
             " 是否在绿区内: ",
-            isInZone
+            isInZone,
           );
         }}
         onGeoError={() => {

package/bin/checkVersion.js

@@ -0,0 +1,36 @@
+#!/usr/bin/env node
+import { open } from "node:fs/promises";
+import * as path from "node:path";
+import * as process from "node:process";
+import { fileURLToPath } from "node:url";
+import * as semver from "semver";
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const libPackagePath = path.resolve(__dirname, "../package.json");
+const projectPackagePath = path.resolve(process.cwd(), "package.json");
+const readProjectPackage = async (packagePath) => {
+  let fileHandler;
+  try {
+    fileHandler = await open(packagePath);
+  } catch (err) {
+    if (err.code == "ENOENT") throw new Error("hint: 确保在项目根目录下运行");
+    else throw err;
+  }
+  try {
+    const content = await fileHandler.readFile("utf-8");
+    return JSON.parse(content);
+  } finally {
+    fileHandler.close();
+  }
+};
+const checkVersion = async (projectPackagePath, libPackagePath) => {
+  const { dependencies } = await readProjectPackage(projectPackagePath);
+  const pkg = await readProjectPackage(libPackagePath);
+  const range = dependencies?.[pkg.name];
+  if (range.startsWith("file:///")) return;
+  if (!range) throw new Error(`hint: 在 package.json 的 dependencies 下面没有 ${pkg.name}`);
+  if (!semver.satisfies(pkg.version, range))
+    throw new Error(
+      `hint: ${pkg.name} 版本不匹配， 要求的版本是: ${range}, 实际安装的版本是 ${pkg.version}`,
+    );
+};
+checkVersion(projectPackagePath, libPackagePath);

package/bin/checkVersion.ts

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+
+import { FileHandle, open } from "node:fs/promises";
+import * as path from "node:path";
+import * as process from "node:process";
+import { fileURLToPath } from "node:url";
+import * as semver from "semver";
+
+interface Package {
+  name?: string;
+  version?: string;
+  dependencies?: Record<string, string>;
+}
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const libPackagePath = path.resolve(__dirname, "../package.json");
+const projectPackagePath = path.resolve(process.cwd(), "package.json");
+
+const readProjectPackage = async (packagePath: string): Promise<Package> => {
+  let fileHandler: FileHandle;
+  try {
+    fileHandler = await open(packagePath);
+  } catch (err) {
+    if (err.code == "ENOENT") throw new Error("hint: 确保在项目根目录下运行");
+    else throw err;
+  }
+  try {
+    const content = await fileHandler.readFile("utf-8");
+    return JSON.parse(content);
+  } finally {
+    fileHandler.close();
+  }
+};
+
+const checkVersion = async (projectPackagePath: string, libPackagePath: string) => {
+  const { dependencies } = await readProjectPackage(projectPackagePath);
+  const pkg = await readProjectPackage(libPackagePath);
+  const range = dependencies?.[pkg.name];
+  if (range.startsWith("file:///")) return;
+  if (!range) throw new Error(`hint: 在 package.json 的 dependencies 下面没有 ${pkg.name}`);
+  if (!semver.satisfies(pkg.version, range))
+    throw new Error(
+      `hint: ${pkg.name} 版本不匹配， 要求的版本是: ${range}, 实际安装的版本是 ${pkg.version}`,
+    );
+};
+
+checkVersion(projectPackagePath, libPackagePath);

package/bin/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "allowSyntheticDefaultImports": true
+  },
+  "include": ["*.ts"]
+}

package/dist/index.cjs

@@ -7,14 +7,18 @@ var __publicField = (obj, key, value) => {
 };
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Vue = require("vue");
-const style = "";
+const style_css_ts_vanilla = "";
 const name = "@heycar/heycars-map";
-const version = "0.9.6";
+const version = "0.9.8-fix1";
 const type = "module";
+const bin = {
+  checkVersion: "./bin/checkVersion.js"
+};
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
   "dev:lib": 'concurrently "vite build -c vite.config.dev.lib.ts --watch --emptyOutDir false"  "tsc --declarationDir dist --emitDeclarationOnly --noEmit false --declaration --watch"',
   build: "rm -rf dist && vite build && tsc --declarationDir dist --emitDeclarationOnly --noEmit false --declaration",
+  "build:bin": "tsc -p ./bin/tsconfig.json && chmod +x bin/*.js",
   lint: "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore --report-unused-disable-directives --max-warnings 0"
 };
 const types = "./dist/index.d.ts";
@@ -53,6 +57,7 @@ const peerDependenciesMeta = {
 const devDependencies = {
   "@types/google.maps": "^3.52.0",
   "@types/lodash-es": "^4.17.6",
+  "@types/semver": "^7.5.1",
   "@typescript-eslint/eslint-plugin": "^5.52.0",
   "@typescript-eslint/parser": "^5.52.0",
   "@vanilla-extract/css": "^1.9.5",
@@ -71,6 +76,7 @@ const devDependencies = {
   "eslint-plugin-prettier": "^4.2.1",
   "eslint-plugin-vue": "^9.9.0",
   prettier: "^2.8.4",
+  semver: "^7.5.4",
   typescript: "^4.9.3",
   "unplugin-vue-jsx": "^0.1.2",
   vite: "^4.1.0",
@@ -90,6 +96,7 @@ const pkg = {
   name,
   version,
   type,
+  bin,
   scripts,
   types,
   module: module$1,
@@ -1529,12 +1536,12 @@ const GmapAdvancedMarkerView = defineSetup(function GmapAdvancedMarkerView2(prop
   return () => null;
 });
 const createDom = (tag, props, innerHtml) => {
-  const { class: className, style: style2, ...restProps } = props != null ? props : {};
+  const { class: className, style, ...restProps } = props != null ? props : {};
   const elm = document.createElement(tag);
   if (className)
     elm.className = className;
-  if (style2)
-    elm.style.cssText = style2;
+  if (style)
+    elm.style.cssText = style;
   Object.assign(elm, restProps);
   if (innerHtml)
     elm.innerHTML = innerHtml;
@@ -5790,6 +5797,7 @@ const useAmapPlace = (props) => {
     async () => {
       await readyPromise;
       const resultPlace = await getPlaceByRegeo(pointRef.value);
+      Object.assign(place, resultPlace);
       onChange == null ? void 0 : onChange(resultPlace);
     }
   );
@@ -5832,6 +5840,7 @@ const useGmapPlace = (props) => {
     async () => {
       await readyPromise;
       const resultPlace = await getPlaceByRegeo(pointRef.value);
+      Object.assign(place, resultPlace);
       onChange == null ? void 0 : onChange(resultPlace);
     }
   );
@@ -6247,12 +6256,12 @@ const APassengerCircle = defineSetup(function APassengerCircle2(props) {
       angle
     } = props;
     const src = size === "large" ? angle === void 0 ? imgPassengerCircle : imgPassengerCircleArrow : angle === void 0 ? imgPassengerSmall : imgPassengerSmallArrow;
-    const style2 = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
+    const style = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
     const type2 = size === "large" ? angle === void 0 ? "large" : "largeArrow" : angle === void 0 ? "small" : "smallArrow";
     return `
         <img class="APassengerCircle ${passengerCircle({
       type: type2
-    })}" style="${style2}" src="${src}">
+    })}" style="${style}" src="${src}">
       `;
   });
   return () => {
@@ -6274,14 +6283,14 @@ const GPassengerCircle = defineSetup(function GPassengerCircle2(props) {
       angle
     } = props;
     const src = size === "large" ? angle === void 0 ? imgPassengerCircle : imgPassengerCircleArrow : angle === void 0 ? imgPassengerSmall : imgPassengerSmallArrow;
-    const style2 = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
+    const style = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
     const type2 = size === "large" ? angle === void 0 ? "large" : "largeArrow" : angle === void 0 ? "small" : "smallArrow";
     return createDom("img", {
       class: `GPassengerCircle ${passengerCircle({
         type: type2
       })}`,
       src,
-      style: style2
+      style
     });
   });
   return () => Vue.h(GmapAdvancedMarkerView, {
@@ -7131,6 +7140,8 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
   });
   watchPostEffectOnce(async () => {
     const value = await updatePlaceCandidates(defaultPlace);
+    if (value.isInZone)
+      setZoom(ZONE_ZOOM);
     emit("changeRecomandPlace", value);
   });
   Vue.watchEffect(() => {

package/dist/index.js

@@ -5,14 +5,18 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 import Vue, { defineComponent, h, computed, inject, provide, watch, onMounted, onUnmounted, watchPostEffect, shallowRef, ref, watchEffect, reactive, toRefs, toRef } from "vue";
-const style = "";
+const style_css_ts_vanilla = "";
 const name = "@heycar/heycars-map";
-const version = "0.9.6";
+const version = "0.9.8-fix1";
 const type = "module";
+const bin = {
+  checkVersion: "./bin/checkVersion.js"
+};
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
   "dev:lib": 'concurrently "vite build -c vite.config.dev.lib.ts --watch --emptyOutDir false"  "tsc --declarationDir dist --emitDeclarationOnly --noEmit false --declaration --watch"',
   build: "rm -rf dist && vite build && tsc --declarationDir dist --emitDeclarationOnly --noEmit false --declaration",
+  "build:bin": "tsc -p ./bin/tsconfig.json && chmod +x bin/*.js",
   lint: "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore --report-unused-disable-directives --max-warnings 0"
 };
 const types = "./dist/index.d.ts";
@@ -51,6 +55,7 @@ const peerDependenciesMeta = {
 const devDependencies = {
   "@types/google.maps": "^3.52.0",
   "@types/lodash-es": "^4.17.6",
+  "@types/semver": "^7.5.1",
   "@typescript-eslint/eslint-plugin": "^5.52.0",
   "@typescript-eslint/parser": "^5.52.0",
   "@vanilla-extract/css": "^1.9.5",
@@ -69,6 +74,7 @@ const devDependencies = {
   "eslint-plugin-prettier": "^4.2.1",
   "eslint-plugin-vue": "^9.9.0",
   prettier: "^2.8.4",
+  semver: "^7.5.4",
   typescript: "^4.9.3",
   "unplugin-vue-jsx": "^0.1.2",
   vite: "^4.1.0",
@@ -88,6 +94,7 @@ const pkg = {
   name,
   version,
   type,
+  bin,
   scripts,
   types,
   module,
@@ -1527,12 +1534,12 @@ const GmapAdvancedMarkerView = defineSetup(function GmapAdvancedMarkerView2(prop
   return () => null;
 });
 const createDom = (tag, props, innerHtml) => {
-  const { class: className, style: style2, ...restProps } = props != null ? props : {};
+  const { class: className, style, ...restProps } = props != null ? props : {};
   const elm = document.createElement(tag);
   if (className)
     elm.className = className;
-  if (style2)
-    elm.style.cssText = style2;
+  if (style)
+    elm.style.cssText = style;
   Object.assign(elm, restProps);
   if (innerHtml)
     elm.innerHTML = innerHtml;
@@ -5788,6 +5795,7 @@ const useAmapPlace = (props) => {
     async () => {
       await readyPromise;
       const resultPlace = await getPlaceByRegeo(pointRef.value);
+      Object.assign(place, resultPlace);
       onChange == null ? void 0 : onChange(resultPlace);
     }
   );
@@ -5830,6 +5838,7 @@ const useGmapPlace = (props) => {
     async () => {
       await readyPromise;
       const resultPlace = await getPlaceByRegeo(pointRef.value);
+      Object.assign(place, resultPlace);
       onChange == null ? void 0 : onChange(resultPlace);
     }
   );
@@ -6245,12 +6254,12 @@ const APassengerCircle = defineSetup(function APassengerCircle2(props) {
       angle
     } = props;
     const src = size === "large" ? angle === void 0 ? imgPassengerCircle : imgPassengerCircleArrow : angle === void 0 ? imgPassengerSmall : imgPassengerSmallArrow;
-    const style2 = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
+    const style = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
     const type2 = size === "large" ? angle === void 0 ? "large" : "largeArrow" : angle === void 0 ? "small" : "smallArrow";
     return `
         <img class="APassengerCircle ${passengerCircle({
       type: type2
-    })}" style="${style2}" src="${src}">
+    })}" style="${style}" src="${src}">
       `;
   });
   return () => {
@@ -6272,14 +6281,14 @@ const GPassengerCircle = defineSetup(function GPassengerCircle2(props) {
       angle
     } = props;
     const src = size === "large" ? angle === void 0 ? imgPassengerCircle : imgPassengerCircleArrow : angle === void 0 ? imgPassengerSmall : imgPassengerSmallArrow;
-    const style2 = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
+    const style = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
     const type2 = size === "large" ? angle === void 0 ? "large" : "largeArrow" : angle === void 0 ? "small" : "smallArrow";
     return createDom("img", {
       class: `GPassengerCircle ${passengerCircle({
         type: type2
       })}`,
       src,
-      style: style2
+      style
     });
   });
   return () => h(GmapAdvancedMarkerView, {
@@ -7129,6 +7138,8 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
   });
   watchPostEffectOnce(async () => {
     const value = await updatePlaceCandidates(defaultPlace);
+    if (value.isInZone)
+      setZoom(ZONE_ZOOM);
     emit("changeRecomandPlace", value);
   });
   watchEffect(() => {

package/dist/src/style.css.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/var.css.d.ts

@@ -0,0 +1,5 @@
+export declare const fontVars: {
+    regular: `var(--${string})` | `var(--${string}, ${string})` | `var(--${string}, ${number})`;
+    medium: `var(--${string})` | `var(--${string}, ${string})` | `var(--${string}, ${number})`;
+    semiBold: `var(--${string})` | `var(--${string}, ${string})` | `var(--${string}, ${number})`;
+};

package/dist/style.css

@@ -1,4 +1,8 @@
-.n8tgem0 {
+:root {
+  --HEYCAR_MAP_CSS_VAR_FONT_REGULAR: PingFangSC-Regular, PingFang SC;
+  --HEYCAR_MAP_CSS_VAR_FONT_MEDIUM: PingFangSC-Medium, PingFang SC;
+  --HEYCAR_MAP_CSS_VAR_FONT_SEMI_BOLD: PingFangSC-Semibold, PingFang SC;
+}.n8tgem0 {
   pointer-events: none;
   position: absolute;
   bottom: 50%;
@@ -28,7 +32,7 @@
 .n8tgem5 {
   display: -webkit-box;
   font-size: 3.47vw;
-  font-family: PingFangSC-Semibold, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_SEMI_BOLD);
   font-weight: 600;
   color: #FFFFFF;
   line-height: 4.8vw;
@@ -39,7 +43,7 @@
 .n8tgem6 {
   margin-top: 0.53vw;
   font-size: 2.93vw;
-  font-family: PingFangSC-Regular, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_REGULAR);
   font-weight: 400;
   color: #FFFFFF;
   line-height: 4.27vw;
@@ -82,7 +86,7 @@
 }
 ._15rq2xn2 {
   font-size: 3.47vw;
-  font-family: PingFangSC-Semibold, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_SEMI_BOLD);
   font-weight: 600;
   color: #FFFFFF;
   line-height: 4.8vw;
@@ -90,7 +94,7 @@
 }
 ._15rq2xn3 {
   font-size: 2.93vw;
-  font-family: PingFangSC-Regular, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_REGULAR);
   font-weight: 400;
   color: #EAFAF8;
   line-height: 4.27vw;
@@ -172,7 +176,7 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
   max-width: 41.33vw;
   width: max-content;
   font-size: 3.2vw;
-  font-family: PingFangSC-Medium, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_MEDIUM);
   font-weight: 500;
   color: #1E1E1E;
   line-height: 4vw;
@@ -183,7 +187,7 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
 ._4a4ovk4 {
   padding-top: 0.6vw;
   font-size: 2.4vw;
-  font-family: PingFangSC-Regular, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_REGULAR);
   font-weight: 400;
   color: #7E7E7E;
   line-height: 3.47vw;
@@ -191,7 +195,7 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
 }
 ._4a4ovk5 {
   color: #4471FF;
-  font-family: PingFangSC-Medium, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_MEDIUM);
   font-weight: 500;
 }
 ._4a4ovk6 {
@@ -275,7 +279,7 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
 .fhyw8c {
   display: -webkit-box;
   font-size: 3.2vw;
-  font-family: PingFangSC-Semibold, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_SEMI_BOLD);
   font-weight: 600;
   color: #243E66;
   line-height: 4.53vw;
@@ -301,7 +305,7 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
 }
 ._65j3sr4 {
   font-size: 3.2vw;
-  font-family: PingFangSC-Medium, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_MEDIUM);
   font-weight: 500;
   color: #1E1E1E;
   line-height: 3.8vw;

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "0.9.6",
+  "version": "0.9.8-fix1",
   "type": "module",
+  "bin": {
+    "checkVersion": "./bin/checkVersion.js"
+  },
   "scripts": {
     "dev": "vite -c vite.config.dev.ts",
     "dev:lib": "concurrently \"vite build -c vite.config.dev.lib.ts --watch --emptyOutDir false\"  \"tsc --declarationDir dist --emitDeclarationOnly --noEmit false --declaration --watch\"",
     "build": "rm -rf dist && vite build && tsc --declarationDir dist --emitDeclarationOnly --noEmit false --declaration",
+    "build:bin": "tsc -p ./bin/tsconfig.json && chmod +x bin/*.js",
     "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore --report-unused-disable-directives --max-warnings 0"
   },
   "types": "./dist/index.d.ts",
@@ -44,6 +48,7 @@
   "devDependencies": {
     "@types/google.maps": "^3.52.0",
     "@types/lodash-es": "^4.17.6",
+    "@types/semver": "^7.5.1",
     "@typescript-eslint/eslint-plugin": "^5.52.0",
     "@typescript-eslint/parser": "^5.52.0",
     "@vanilla-extract/css": "^1.9.5",
@@ -62,6 +67,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-vue": "^9.9.0",
     "prettier": "^2.8.4",
+    "semver": "^7.5.4",
     "typescript": "^4.9.3",
     "unplugin-vue-jsx": "^0.1.2",
     "vite": "^4.1.0",

package/tsconfig.json

@@ -21,5 +21,6 @@
     "src/**/*.vue",
     "../vite.config.dev.ts"
   ],
+  "exclude": ["bin/**/*.*"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }