@heycar/heycars-map 0.9.7 → 0.9.8-fix2

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

@@ -9,12 +9,16 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Vue = require("vue");
 const style_css_ts_vanilla = "";
 const name = "@heycar/heycars-map";
-const version = "0.9.7";
+const version = "0.9.8-fix2";
 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,
@@ -3824,7 +3831,11 @@ function wechatWatchPosition(onSuccess, onError, option) {
             isHandled = true;
             const isGeoWorking = isGeoWorkingRef.value;
             isGeoWorkingRef.value = false;
-            console.warn("MyWarning: wx.getLocation failed msg = ", res.errMsg);
+            console.warn(
+              "MyWarning: wx.getLocation failed errcode, errmsg = ",
+              res.errCode,
+              res.errMsg
+            );
             resolve(void 0);
             if (!isGeoWorking)
               return;
@@ -3914,6 +3925,25 @@ function compatibleWathPosition(onSuccess, onError, option) {
   const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
   return () => navigator.geolocation.clearWatch(watchId);
 }
+window.efg = () => my.getLocation({
+  type: 0,
+  cacheTimeout: 1,
+  success(res) {
+    console.log("my.getLocation success = ", JSON.stringify(res, null, 2));
+  },
+  fail(res) {
+    console.log("my.getLocation fail = ", JSON.stringify(res, null, 2));
+  }
+});
+window.abc = () => wx.getLocation({
+  type: "wgs84",
+  success(res) {
+    console.log("wx.getLocation success = ", JSON.stringify(res, null, 2));
+  },
+  fail(res) {
+    console.log("wx.getLocation fail = ", JSON.stringify(res, null, 2));
+  }
+});
 class SingleGeoWatch {
   constructor(option) {
     __publicField(this, "id", 0);
@@ -5790,6 +5820,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 +5863,7 @@ const useGmapPlace = (props) => {
     async () => {
       await readyPromise;
       const resultPlace = await getPlaceByRegeo(pointRef.value);
+      Object.assign(place, resultPlace);
       onChange == null ? void 0 : onChange(resultPlace);
     }
   );

package/dist/index.js

@@ -7,12 +7,16 @@ var __publicField = (obj, key, value) => {
 import Vue, { defineComponent, h, computed, inject, provide, watch, onMounted, onUnmounted, watchPostEffect, shallowRef, ref, watchEffect, reactive, toRefs, toRef } from "vue";
 const style_css_ts_vanilla = "";
 const name = "@heycar/heycars-map";
-const version = "0.9.7";
+const version = "0.9.8-fix2";
 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,
@@ -3822,7 +3829,11 @@ function wechatWatchPosition(onSuccess, onError, option) {
             isHandled = true;
             const isGeoWorking = isGeoWorkingRef.value;
             isGeoWorkingRef.value = false;
-            console.warn("MyWarning: wx.getLocation failed msg = ", res.errMsg);
+            console.warn(
+              "MyWarning: wx.getLocation failed errcode, errmsg = ",
+              res.errCode,
+              res.errMsg
+            );
             resolve(void 0);
             if (!isGeoWorking)
               return;
@@ -3912,6 +3923,25 @@ function compatibleWathPosition(onSuccess, onError, option) {
   const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
   return () => navigator.geolocation.clearWatch(watchId);
 }
+window.efg = () => my.getLocation({
+  type: 0,
+  cacheTimeout: 1,
+  success(res) {
+    console.log("my.getLocation success = ", JSON.stringify(res, null, 2));
+  },
+  fail(res) {
+    console.log("my.getLocation fail = ", JSON.stringify(res, null, 2));
+  }
+});
+window.abc = () => wx.getLocation({
+  type: "wgs84",
+  success(res) {
+    console.log("wx.getLocation success = ", JSON.stringify(res, null, 2));
+  },
+  fail(res) {
+    console.log("wx.getLocation fail = ", JSON.stringify(res, null, 2));
+  }
+});
 class SingleGeoWatch {
   constructor(option) {
     __publicField(this, "id", 0);
@@ -5788,6 +5818,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 +5861,7 @@ const useGmapPlace = (props) => {
     async () => {
       await readyPromise;
       const resultPlace = await getPlaceByRegeo(pointRef.value);
+      Object.assign(place, resultPlace);
       onChange == null ? void 0 : onChange(resultPlace);
     }
   );

package/dist/src/types/my.d.ts

@@ -0,0 +1,21 @@
+interface MyGetLocationSuccessResponse {
+    longitude: number;
+    latitude: number;
+    accuracy: number;
+    altitude: number;
+}
+interface MyErrorResponse {
+    error: number;
+    errorMessage: string;
+}
+interface MyGetLocationProps {
+    type: 0 | 1 | 2 | 3;
+    cacheTimeout: number;
+    success: (response: MyGetLocationSuccessResponse) => void;
+    fail?: (response: MyErrorResponse) => void;
+    complete?: () => void;
+}
+export interface My {
+    getLocation: (props: MyGetLocationProps) => void;
+}
+export {};

package/dist/src/types/wx.d.ts

@@ -1,4 +1,5 @@
 export interface WxResponse {
+    errCode: string;
     errMsg: string;
 }
 export interface WxGetLocationSuccessResponse extends WxResponse {

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "0.9.7",
+  "version": "0.9.8-fix2",
   "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" }]
 }